mirror of
https://github.com/systemd/systemd.git
synced 2025-01-11 09:18:07 +03:00
make: build internal tools against libudev-private.la
This commit is contained in:
parent
4b6769f612
commit
2a827c959a
5
NEWS
5
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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
create_floppy_devices_LDADD = \
|
||||
$(top_builddir)/libudev/libudev-private.la
|
||||
|
||||
if WITH_SELINUX
|
||||
create_floppy_devices_SOURCES += \
|
||||
../../libudev/libudev-selinux-private.c
|
||||
create_floppy_devices_LDADD = \
|
||||
create_floppy_devices_LDADD += \
|
||||
$(SELINUX_LIBS)
|
||||
endif
|
||||
|
@ -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
|
||||
|
@ -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@
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user