libudev: move to top-level directory

11 files changed, 47 insertions, 47 deletions

diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index d31fd2c93c..ffbdba32f2 100644
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -6,10 +6,10 @@ udevhome_PROGRAMS = \
 
 ata_id_SOURCES = \
 	ata_id.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../udev/udev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
 dist_man_MANS = \
 	ata_id.8
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index 51b6a20ee2..8e1968e6e1 100644
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -10,10 +10,10 @@ dist_udevrules_DATA = \
 
 cdrom_id_SOURCES = \
 	cdrom_id.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
 dist_man_MANS = \
 	cdrom_id.8
diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am
index d9792b89eb..7ad2937f5d 100644
--- a/extras/collect/Makefile.am
+++ b/extras/collect/Makefile.am
@@ -6,7 +6,7 @@ udevhome_PROGRAMS = \
 
 collect_SOURCES = \
 	collect.c \
-	../../udev/lib/libudev-private.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-util.c \
-	../../udev/lib/libudev-list.c
+	../../libudev/libudev-private.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-util.c \
+	../../libudev/libudev-list.c
diff --git a/extras/collect/collect.c b/extras/collect/collect.c
index 3a7e826e4d..3284c3df40 100644
--- a/extras/collect/collect.c
+++ b/extras/collect/collect.c
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../../udev/lib/libudev.h"
-#include "../../udev/lib/libudev-private.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 #define TMPFILE			UDEV_PREFIX "/dev/.udev/collect"
 #define BUFSIZE			16
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index 9bfe43231f..7c562d3c31 100644
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -10,10 +10,10 @@ dist_udevrules_DATA = \
 
 edd_id_SOURCES = \
 	edd_id.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
 dist_man_MANS = \
 	edd_id.8
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index 8cb9cbd47d..2baaa10f02 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -6,12 +6,12 @@ udevhome_PROGRAMS = \
 
 create_floppy_devices_SOURCES = \
 	create_floppy_devices.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c \
-	../../udev/lib/libudev-device.c \
-	../../udev/lib/libudev-enumerate.c \
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c \
+	../../libudev/libudev-device.c \
+	../../libudev/libudev-enumerate.c \
 	../../udev/udev-util.c
 
 if USE_SELINUX
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index c63dc7cf17..42acfd15cf 100644
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -10,8 +10,8 @@ dist_udevrules_DATA = \
 
 fstab_import_SOURCES = \
 	fstab_import.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
diff --git a/extras/path_id/Makefile.am b/extras/path_id/Makefile.am
index 5d4bf6283d..867ad5ef8e 100644
--- a/extras/path_id/Makefile.am
+++ b/extras/path_id/Makefile.am
@@ -6,12 +6,12 @@ udevhome_PROGRAMS = \
 
 path_id_SOURCES = \
 	path_id.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-device.c \
-	../../udev/lib/libudev-enumerate.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-device.c \
+	../../libudev/libudev-enumerate.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
 dist_man_MANS = \
 	path_id.8
diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c
index 08b7e150c9..dbb52bad21 100644
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -28,8 +28,8 @@
 #include <dirent.h>
 #include <getopt.h>
 
-#include <../../udev/lib/libudev.h>
-#include <../../udev/udev.h>
+#include "libudev.h"
+#include "../../udev/udev.h"
 
 int debug;
 
@@ -366,7 +366,7 @@ int main(int argc, char **argv)
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("usb_id");
+	logging_init("path_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 29d5fe7344..ffebc38e20 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -10,10 +10,10 @@ scsi_id_SOURCES = \
 	scsi.h \
 	scsi_id.h \
 	bsg.h \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c
 
 dist_sysconf_DATA = \
 	scsi_id.config
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index 07b286d61f..a9bd407031 100644
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -6,12 +6,12 @@ udevhome_PROGRAMS = \
 
 usb_id_SOURCES = \
 	usb_id.c \
-	../../udev/lib/libudev.h \
-	../../udev/lib/libudev.c \
-	../../udev/lib/libudev-list.c \
-	../../udev/lib/libudev-util.c \
-	../../udev/lib/libudev-device.c \
-	../../udev/lib/libudev-enumerate.c
+	../../libudev/libudev.h \
+	../../libudev/libudev.c \
+	../../libudev/libudev-list.c \
+	../../libudev/libudev-util.c \
+	../../libudev/libudev-device.c \
+	../../libudev/libudev-enumerate.c
 
 dist_man_MANS = \
 	usb_id.8