make: build internal tools against libudev-private.la

diff --git a/NEWS b/NEWS
index 1985d300d1d747d2a8d1a93d358d5bc52096bb09..b36ace5c05964ef618b28ee29444cb5e7f707bb4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+udev 146
+========
+New keymaps, new modem, hid2hci updated.
+
+
 udev 145
 ========
 Fix possible crash in udevd when worker processes are busy, rules are

diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index d0f467954e81354bd2b86585a4ebe60c3efcdbf5..54580661feb89a469cc915e717da08eb98bee2e2 100644 (file)
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -4,9 +4,8 @@ libexec_PROGRAMS = \
        ata_id
 
 ata_id_SOURCES = \
-       ata_id.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev-private.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       ata_id.c
+
+ata_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+

diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index d86e68e990112c866b9b355e021621e75d3dd765..f2307d2e78e6ad09e71d7f1ca1e12153cb717c7d 100644 (file)
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -7,9 +7,7 @@ dist_udevrules_DATA = \
        60-cdrom_id.rules
 
 cdrom_id_SOURCES = \
-       cdrom_id.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev-private.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       cdrom_id.c
+
+cdrom_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la

diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am
index 878b8ec133fa01b75492381a9ffae41671274e1f..19e25c5056946ce520b47093f6312ecaaf130147 100644 (file)
--- a/extras/collect/Makefile.am
+++ b/extras/collect/Makefile.am
@@ -4,8 +4,8 @@ libexec_PROGRAMS = \
        collect
 
 collect_SOURCES = \
-       collect.c \
-       ../../libudev/libudev-private.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-util.c \
-       ../../libudev/libudev-list.c
+       collect.c
+
+collect_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+

diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index 464e667fadd5bde381da9e15b6f940fd37536091..3ff562fdbd8f01dda6e819d13b47581ddc8a151e 100644 (file)
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -7,8 +7,8 @@ dist_udevrules_DATA = \
        61-persistent-storage-edd.rules
 
 edd_id_SOURCES = \
-       edd_id.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       edd_id.c
+
+edd_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+

diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index 3160ce5e7649ae0747e79924ea77b8b5d4f1985c..05f7a0f167b6be4bf5e20545aae5af9c4dbf5553 100644 (file)
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -4,19 +4,12 @@ libexec_PROGRAMS = \
        create_floppy_devices
 
 create_floppy_devices_SOURCES = \
-       create_floppy_devices.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev-private.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c \
-       ../../libudev/libudev-util-private.c \
-       ../../libudev/libudev-device.c \
-       ../../libudev/libudev-enumerate.c
+       create_floppy_devices.c
 
-if WITH_SELINUX
-create_floppy_devices_SOURCES += \
-       ../../libudev/libudev-selinux-private.c
 create_floppy_devices_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+
+if WITH_SELINUX
+create_floppy_devices_LDADD += \
        $(SELINUX_LIBS)
 endif

diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index 59e208cabacdd64a2009563e113cb91733d708fc..bfa0c4b59e95c239727fcbc05cdf060c960d3e61 100644 (file)
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -7,9 +7,7 @@ dist_udevrules_DATA = \
        79-fstab_import.rules
 
 fstab_import_SOURCES = \
-       fstab_import.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       fstab_import.c
 
+fstab_import_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la

diff --git a/extras/hid2hci/Makefile.am b/extras/hid2hci/Makefile.am
index 5450c341989a120ba6412a27d32c559fa3f86916..f3a73c5e8678af8dd9cde5e1bc200b7b7505105d 100644 (file)
--- a/extras/hid2hci/Makefile.am
+++ b/extras/hid2hci/Makefile.am
@@ -7,13 +7,8 @@ dist_udevrules_DATA = \
        70-hid2hci.rules
 
 hid2hci_SOURCES = \
-       hid2hci.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c \
-       ../../libudev/libudev-device.c \
-       ../../libudev/libudev-enumerate.c
+       hid2hci.c
 
 hid2hci_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la \
        @LIBUSB_LIBS@

diff --git a/extras/path_id/Makefile.am b/extras/path_id/Makefile.am
index ca1c21eda5d2a26a6ab66e88f30aa2771cee7492..ffcc51f10632b6f557395b6730ea0c92876e17ff 100644 (file)
--- a/extras/path_id/Makefile.am
+++ b/extras/path_id/Makefile.am
@@ -4,10 +4,8 @@ libexec_PROGRAMS = \
        path_id
 
 path_id_SOURCES = \
-       path_id.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-device.c \
-       ../../libudev/libudev-enumerate.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       path_id.c
+
+path_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+

diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 641a340ddb0d98a21ed207fe783663a72c4a643f..4c6fe471c3373415cd17e9a925c6b1734269acaa 100644 (file)
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -8,11 +8,10 @@ scsi_id_SOURCES = \
        scsi_serial.c \
        scsi.h \
        scsi_id.h \
-       bsg.h \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c
+       bsg.h
+
+scsi_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
 
 dist_man_MANS = \
        scsi_id.8

diff --git a/extras/udev-acl/Makefile.am b/extras/udev-acl/Makefile.am
index 7586bb01c1d1de94bc15c3b36bc4f1b142107caa..1b337c3a2cab0642077e6f00d7d3b4674bacc5a2 100644 (file)
--- a/extras/udev-acl/Makefile.am
+++ b/extras/udev-acl/Makefile.am
@@ -10,7 +10,7 @@ udev_acl_CPPFLAGS = \
        $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 udev_acl_LDADD = \
-       -lacl $(top_builddir)/libudev/libudev.la $(GLIB_LIBS)
+       -lacl $(top_builddir)/libudev/libudev-private.la $(GLIB_LIBS)
 
 dist_udevrules_DATA = 70-acl.rules
 

diff --git a/extras/usb-db/Makefile.am b/extras/usb-db/Makefile.am
index 2ac61f6aa19c4972f9c0c5a1d554e1bddab4972a..fa974b5f8f09df0f8089d8bc636492f95ec92714 100644 (file)
--- a/extras/usb-db/Makefile.am
+++ b/extras/usb-db/Makefile.am
@@ -10,7 +10,7 @@ usb_db_CPPFLAGS = \
        $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
 
 usb_db_LDADD = \
-       $(top_builddir)/libudev/libudev.la
+       $(top_builddir)/libudev/libudev-private.la
 
 
 pci_db_SOURCES = \
@@ -20,4 +20,4 @@ pci_db_CPPFLAGS = \
        $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
 
 pci_db_LDADD = \
-       $(top_builddir)/libudev/libudev.la
+       $(top_builddir)/libudev/libudev-private.la

diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index 6ea7b5132ced3668f6fd03c6a2bdf17474473d0b..9d94493e7a3fad9c138e29240dc3fb3a731534fe 100644 (file)
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -4,10 +4,8 @@ libexec_PROGRAMS = \
        usb_id
 
 usb_id_SOURCES = \
-       usb_id.c \
-       ../../libudev/libudev.h \
-       ../../libudev/libudev.c \
-       ../../libudev/libudev-list.c \
-       ../../libudev/libudev-util.c \
-       ../../libudev/libudev-device.c \
-       ../../libudev/libudev-enumerate.c
+       usb_id.c
+
+usb_id_LDADD = \
+       $(top_builddir)/libudev/libudev-private.la
+

diff --git a/libudev/Makefile.am b/libudev/Makefile.am
index e83888617a7dfdf0f2e6a1cd6d971ebffb90b780..6989bf31f31d4eddc52889b2a873c6856e38a00d 100644 (file)
--- a/libudev/Makefile.am
+++ b/libudev/Makefile.am
@@ -28,6 +28,21 @@ libudev_la_SOURCES =\
        libudev-monitor.c \
        libudev-queue.c
 
+noinst_LTLIBRARIES = \
+       libudev-private.la
+
+libudev_private_la_SOURCES =\
+       $(libudev_la_SOURCES) \
+       libudev-ctrl.c \
+       libudev-util-private.c \
+       libudev-device-private.c \
+       libudev-queue-private.c
+
+if WITH_SELINUX
+libudev_private_la_SOURCES += \
+       libudev-selinux-private.c
+endif
+
 LT_CURRENT=5
 LT_REVISION=0
 LT_AGE=5

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 6c0b94e2cf7de54d117c3f73c399c020daab347b..f1d4d2d437a9b8093e708f59d826b2cf096afa46 100644 (file)
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -7,31 +7,16 @@ sbin_PROGRAMS = \
 noinst_PROGRAMS = \
        test-udev
 
-common_ldadd =
-
-common_files = \
+common_files =\
        udev.h \
        udev-event.c \
        udev-watch.c \
        udev-node.c \
-       udev-rules.c \
-       ../libudev/libudev.h \
-       ../libudev/libudev-private.h \
-       ../libudev/libudev.c \
-       ../libudev/libudev-list.c \
-       ../libudev/libudev-util.c \
-       ../libudev/libudev-util-private.c \
-       ../libudev/libudev-device.c \
-       ../libudev/libudev-device-private.c \
-       ../libudev/libudev-monitor.c \
-       ../libudev/libudev-enumerate.c \
-       ../libudev/libudev-queue.c \
-       ../libudev/libudev-queue-private.c \
-       ../libudev/libudev-ctrl.c
+       udev-rules.c
 
+common_ldadd = \
+       $(top_builddir)/libudev/libudev-private.la
 if WITH_SELINUX
-common_files += \
-       ../libudev/libudev-selinux-private.c
 common_ldadd += \
        $(SELINUX_LIBS)
 endif
@@ -43,7 +28,6 @@ udevd_SOURCES = \
 udevd_LDADD = \
        $(common_ldadd)
 
-
 udevadm_SOURCES = \
        $(common_files) \
        udevadm.c \