X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0064631e44aa9f6943a997433de65a28becf1c86;hb=c7f9693c149d2179d7922cae3e9930381a3a1d11;hp=178685ea22108c23ab3ecd37ed9424c3ece5958f;hpb=28e490c945e16f9d2dce7cff9967ed5d11b23f93;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 178685ea2..0064631e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,19 +144,17 @@ dist_udevrules_DATA = \
 	rules/rules.d/60-persistent-serial.rules \
 	rules/rules.d/60-persistent-input.rules \
 	rules/rules.d/60-persistent-alsa.rules \
+	rules/rules.d/60-persistent-storage.rules \
 	rules/rules.d/95-udev-late.rules
 
 udevrules_DATA = \
-	rules/rules.d/60-persistent-storage.rules \
 	rules/rules.d/80-drivers.rules
 
 EXTRA_DIST += \
-	rules/rules.d/80-drivers.rules.in \
-	rules/rules.d/60-persistent-storage.rules.in
+	rules/rules.d/80-drivers.rules.in
 
 CLEANFILES += \
-	rules/rules.d/80-drivers.rules \
-	rules/rules.d/60-persistent-storage.rules
+	rules/rules.d/80-drivers.rules
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
@@ -203,7 +201,7 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
 	udev/udevd
 
-udev_common_sources =\
+udev_common_sources = \
 	udev/udev.h \
 	udev/udev-event.c \
 	udev/udev-watch.c \
@@ -213,14 +211,24 @@ udev_common_sources =\
 	udev/udev-builtin.c \
 	udev/udev-builtin-path_id.c \
 	udev/udev-builtin-usb_id.c \
-	udev/udev-builtin-input_id.c
+	udev/udev-builtin-input_id.c \
+	udev/udev-builtin-blkid.c \
+	udev/udev-builtin-kmod.c
+
+udev_common_CFLAGS = \
+	$(BLKID_CFLAGS)
+
+udev_common_LDADD = \
+	libudev/libudev-private.la \
+	$(BLKID_LIBS)
 
 udev_udevd_SOURCES = \
 	$(udev_common_sources) \
 	udev/udevd.c \
 	udev/sd-daemon.h \
 	udev/sd-daemon.c
-udev_udevd_LDADD = libudev/libudev-private.la
+udev_udevd_CFLAGS = $(udev_common_CFLAGS)
+udev_udevd_LDADD = $(udev_common_LDADD)
 
 udev_udevadm_SOURCES = \
 	$(udev_common_sources) \
@@ -232,7 +240,8 @@ udev_udevadm_SOURCES = \
 	udev/udevadm-trigger.c \
 	udev/udevadm-test.c \
 	udev/udevadm-test-builtin.c
-udev_udevadm_LDADD = libudev/libudev-private.la
+udev_udevadm_CFLAGS = $(udev_common_CFLAGS)
+udev_udevadm_LDADD = $(udev_common_LDADD)
 
 # ------------------------------------------------------------------------------
 # udev man pages
@@ -273,7 +282,8 @@ libudev_test_libudev_LDADD = libudev/libudev.la
 udev_test_udev_SOURCES = \
 	$(udev_common_sources) \
 	udev/test-udev.c
-udev_test_udev_LDADD = libudev/libudev-private.la
+udev_test_udev_CFLAGS = $(udev_common_CFLAGS)
+udev_test_udev_LDADD = $(udev_common_LDADD)
 
 # ------------------------------------------------------------------------------
 # firmware - firmware loading