[PATCH] udev use new libsysfs header file location

Use the new location of libsysfs header files.

16 files changed, 16 insertions, 28 deletions

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 75a342bb12..2754381976 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -32,14 +32,8 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/stat.h>
-#ifdef __KLIBC__
-/*
- * Assume built under udev with KLIBC
- */
-#include <libsysfs.h>
-#else
 #include <sysfs/libsysfs.h>
-#endif
+
 #include "scsi_id_version.h"
 #include "scsi_id.h"
 
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 80a1d51635..9fb0f05e61 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -31,14 +31,8 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <scsi/sg.h>
-#ifdef __KLIBC__
-/*
- * Assume built under udev with KLIBC
- */
-#include <libsysfs.h>
-#else
 #include <sysfs/libsysfs.h>
-#endif
+
 #include "scsi_id.h"
 #include "scsi.h"
 
diff --git a/libsysfs/sysfs_bus.c b/libsysfs/sysfs_bus.c
index aca392875e..87318c0029 100644
--- a/libsysfs/sysfs_bus.c
+++ b/libsysfs/sysfs_bus.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_dev(void *dev)
diff --git a/libsysfs/sysfs_class.c b/libsysfs/sysfs_class.c
index cd86912142..05305056dd 100644
--- a/libsysfs/sysfs_class.c
+++ b/libsysfs/sysfs_class.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_cls_dev(void *dev)
diff --git a/libsysfs/sysfs_device.c b/libsysfs/sysfs_device.c
index bfd761b885..06b8d2d99a 100644
--- a/libsysfs/sysfs_device.c
+++ b/libsysfs/sysfs_device.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 /**
diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index ce01669754..050e674038 100644
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 /**
diff --git a/libsysfs/sysfs_driver.c b/libsysfs/sysfs_driver.c
index a4440cfdf9..cd202d9f23 100644
--- a/libsysfs/sysfs_driver.c
+++ b/libsysfs/sysfs_driver.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_driver_device(void *device)
diff --git a/libsysfs/sysfs_utils.c b/libsysfs/sysfs_utils.c
index f1f82361d0..2509c73c98 100644
--- a/libsysfs/sysfs_utils.c
+++ b/libsysfs/sysfs_utils.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 #ifndef __KLIBC__
 #include <mntent.h>
diff --git a/namedev.c b/namedev.c
index 90c85d41e4..89513934ff 100644
--- a/namedev.c
+++ b/namedev.c
@@ -32,13 +32,13 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sysfs/libsysfs.h>
 
 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
diff --git a/udev-add.c b/udev-add.c
index a3bc0df579..87cf57c3b6 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -33,6 +33,7 @@
 #ifndef __KLIBC__
 #include <pwd.h>
 #endif
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -40,7 +41,6 @@
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 /* 
diff --git a/udev.c b/udev.c
index ce6d6ce9df..f3fab18b29 100644
--- a/udev.c
+++ b/udev.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -33,7 +34,6 @@
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
diff --git a/udev.h b/udev.h
index 1cd07852b4..b5088b90c6 100644
--- a/udev.h
+++ b/udev.h
@@ -23,7 +23,7 @@
 #ifndef UDEV_H
 #define UDEV_H
 
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
 #include <stddef.h>
 #include <sys/param.h>
 
diff --git a/udev_config.c b/udev_config.c
index 6714c1b73d..1d05a3fb13 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -31,12 +31,12 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
diff --git a/udevdb.c b/udevdb.c
index e657fedcb2..bfd5b4bd69 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev_version.h"
 #include "udev.h"
@@ -39,7 +40,6 @@
 #include "namedev.h"
 #include "udevdb.h"
 #include "tdb/tdb.h"
-#include "libsysfs/libsysfs.h"
 
 static TDB_CONTEXT *udevdb;
 
diff --git a/udevinfo.c b/udevinfo.c
index e4ea698111..7991855b28 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -26,12 +26,12 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 
 # define SYSFS_VALUE_MAX 200
diff --git a/udevtest.c b/udevtest.c
index dd8375aa5c..175f143269 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -26,12 +26,12 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;