chiark / gitweb /
libudev: move to top-level directory
authorKay Sievers <kay.sievers@vrfy.org>
Mon, 8 Jun 2009 19:36:06 +0000 (21:36 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Mon, 8 Jun 2009 19:36:06 +0000 (21:36 +0200)
33 files changed:
Makefile.am
Makefile.am.inc
configure.ac
extras/ata_id/Makefile.am
extras/cdrom_id/Makefile.am
extras/collect/Makefile.am
extras/collect/collect.c
extras/edd_id/Makefile.am
extras/floppy/Makefile.am
extras/fstab_import/Makefile.am
extras/path_id/Makefile.am
extras/path_id/path_id.c
extras/scsi_id/Makefile.am
extras/usb_id/Makefile.am
libudev/.gitignore [moved from udev/lib/.gitignore with 100% similarity]
libudev/Makefile.am [moved from udev/lib/Makefile.am with 96% similarity]
libudev/exported_symbols [moved from udev/lib/exported_symbols with 100% similarity]
libudev/libudev-ctrl.c [moved from udev/lib/libudev-ctrl.c with 100% similarity]
libudev/libudev-device-db-write.c [moved from udev/lib/libudev-device-db-write.c with 100% similarity]
libudev/libudev-device.c [moved from udev/lib/libudev-device.c with 100% similarity]
libudev/libudev-enumerate.c [moved from udev/lib/libudev-enumerate.c with 100% similarity]
libudev/libudev-list.c [moved from udev/lib/libudev-list.c with 100% similarity]
libudev/libudev-monitor.c [moved from udev/lib/libudev-monitor.c with 100% similarity]
libudev/libudev-private.h [moved from udev/lib/libudev-private.h with 100% similarity]
libudev/libudev-queue-export.c [moved from udev/lib/libudev-queue-export.c with 100% similarity]
libudev/libudev-queue.c [moved from udev/lib/libudev-queue.c with 100% similarity]
libudev/libudev-util.c [moved from udev/lib/libudev-util.c with 100% similarity]
libudev/libudev.c [moved from udev/lib/libudev.c with 100% similarity]
libudev/libudev.h [moved from udev/lib/libudev.h with 96% similarity]
libudev/libudev.pc.in [moved from udev/lib/libudev.pc.in with 100% similarity]
libudev/test-libudev.c [moved from udev/lib/test-libudev.c with 100% similarity]
udev/Makefile.am
udev/udev.h

index 1bb2d77..678a3e4 100644 (file)
@@ -1,6 +1,7 @@
 include $(top_srcdir)/Makefile.am.inc
 
 SUBDIRS = \
+       libudev \
        udev \
        rules \
        extras
index 7ecd55d..802143b 100644 (file)
@@ -1,8 +1,8 @@
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
+       -I$(top_builddir)/libudev \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DUDEV_PREFIX=\""$(udev_prefix)"\" \
-       -D_LIBUDEV_COMPILATION
+       -DUDEV_PREFIX=\""$(udev_prefix)"\"
 
 AM_CFLAGS =
 
index 9857d52..e9c9496 100644 (file)
@@ -70,9 +70,9 @@ fi
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
+       libudev/Makefile
+       libudev/libudev.pc
        udev/Makefile
-       udev/lib/Makefile
-       udev/lib/libudev.pc
        rules/Makefile
        extras/Makefile
        extras/ata_id/Makefile
index d31fd2c..ffbdba3 100644 (file)
@@ -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
index 51b6a20..8e1968e 100644 (file)
@@ -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
index d9792b8..7ad2937 100644 (file)
@@ -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
index 3a7e826..3284c3d 100644 (file)
@@ -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
index 9bfe432..7c562d3 100644 (file)
@@ -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
index 8cb9cbd..2baaa10 100644 (file)
@@ -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
index c63dc7c..42acfd1 100644 (file)
@@ -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
 
index 5d4bf62..867ad5e 100644 (file)
@@ -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
index 08b7e15..dbb52ba 100644 (file)
@@ -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) {
index 29d5fe7..ffebc38 100644 (file)
@@ -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
index 07b286d..a9bd407 100644 (file)
@@ -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
similarity index 100%
rename from udev/lib/.gitignore
rename to libudev/.gitignore
similarity index 96%
rename from udev/lib/Makefile.am
rename to libudev/Makefile.am
index 7cd8833..1f0bf2f 100644 (file)
@@ -28,7 +28,7 @@ libudev_la_SOURCES =\
 
 libudev_la_LDFLAGS = \
        -version-info $(LIBUDEV_LT_CURRENT):$(LIBUDEV_LT_REVISION):$(LIBUDEV_LT_AGE) \
-       -export-symbols $(top_srcdir)/udev/lib/exported_symbols
+       -export-symbols $(top_srcdir)/libudev/exported_symbols
 
 pkgconfigdir = $(prefix)/$(libdir_name)/pkgconfig
 pkgconfig_DATA = libudev.pc
similarity index 100%
rename from udev/lib/libudev.c
rename to libudev/libudev.c
similarity index 96%
rename from udev/lib/libudev.h
rename to libudev/libudev.h
index 241091c..ffeb80f 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 
-/* this will stay as long as the DeviceKit integration of udev is work in progress */
-#if !defined _LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
-#error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
-#endif
-
 /*
  * udev - library context
  * 
similarity index 100%
rename from udev/lib/libudev.pc.in
rename to libudev/libudev.pc.in
index 94989e6..ca5b4fa 100644 (file)
@@ -1,8 +1,5 @@
 include $(top_srcdir)/Makefile.am.inc
 
-SUBDIRS = \
-       lib
-
 sbin_PROGRAMS = \
        udevd \
        udevadm
@@ -19,18 +16,18 @@ common_files = \
        udev-node.c \
        udev-rules.c \
        udev-util.c \
-       lib/libudev.h \
-       lib/libudev-private.h \
-       lib/libudev.c \
-       lib/libudev-list.c \
-       lib/libudev-util.c \
-       lib/libudev-device.c \
-       lib/libudev-device-db-write.c \
-       lib/libudev-monitor.c \
-       lib/libudev-enumerate.c \
-       lib/libudev-queue.c \
-       lib/libudev-queue-export.c \
-       lib/libudev-ctrl.c
+       ../libudev/libudev.h \
+       ../libudev/libudev-private.h \
+       ../libudev/libudev.c \
+       ../libudev/libudev-list.c \
+       ../libudev/libudev-util.c \
+       ../libudev/libudev-device.c \
+       ../libudev/libudev-device-db-write.c \
+       ../libudev/libudev-monitor.c \
+       ../libudev/libudev-enumerate.c \
+       ../libudev/libudev-queue.c \
+       ../libudev/libudev-queue-export.c \
+       ../libudev/libudev-ctrl.c
 
 if USE_SELINUX
 common_files += \
index 7187975..8926dee 100644 (file)
@@ -22,8 +22,8 @@
 #include <sys/types.h>
 #include <sys/param.h>
 
-#include "lib/libudev.h"
-#include "lib/libudev-private.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180