From 2a827c959a77eb6df9539235c46c96b78a824cf9 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 25 Jul 2009 20:37:45 +0200 Subject: [PATCH] make: build internal tools against libudev-private.la --- NEWS | 5 +++++ extras/ata_id/Makefile.am | 11 +++++------ extras/cdrom_id/Makefile.am | 10 ++++------ extras/collect/Makefile.am | 10 +++++----- extras/edd_id/Makefile.am | 10 +++++----- extras/floppy/Makefile.am | 17 +++++------------ extras/fstab_import/Makefile.am | 8 +++----- extras/hid2hci/Makefile.am | 9 ++------- extras/path_id/Makefile.am | 12 +++++------- extras/scsi_id/Makefile.am | 9 ++++----- extras/udev-acl/Makefile.am | 2 +- extras/usb-db/Makefile.am | 4 ++-- extras/usb_id/Makefile.am | 12 +++++------- libudev/Makefile.am | 15 +++++++++++++++ udev/Makefile.am | 24 ++++-------------------- 15 files changed, 70 insertions(+), 88 deletions(-) diff --git a/NEWS b/NEWS index 1985d300..b36ace5c 100644 --- 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 d0f46795..54580661 100644 --- 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 d86e68e9..f2307d2e 100644 --- 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 878b8ec1..19e25c50 100644 --- 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 464e667f..3ff562fd 100644 --- 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 3160ce5e..05f7a0f1 100644 --- 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 59e208ca..bfa0c4b5 100644 --- 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 5450c341..f3a73c5e 100644 --- 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 ca1c21ed..ffcc51f1 100644 --- 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 641a340d..4c6fe471 100644 --- 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 7586bb01..1b337c3a 100644 --- 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 2ac61f6a..fa974b5f 100644 --- 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 6ea7b513..9d94493e 100644 --- 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 e8388861..6989bf31 100644 --- 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 6c0b94e2..f1d4d2d4 100644 --- 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 \ -- 2.39.5