X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=47ed3ccc48c99b2bdee5da4e2b7b21eb6f7fbcd8;hb=f71a55810f09fc010b44689aa00823a745ff83c6;hp=3ac85b95cc7125fd417ae270005ee0fa61d2ac46;hpb=81dadce58f80edae4dc45ba55a2c41cb0f26570b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 3ac85b95c..47ed3ccc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
 	-DLIBEXECDIR=\""$(libexecdir)"\"
 
 AM_CFLAGS = \
+	${my_CFLAGS} \
 	-fvisibility=hidden \
 	-ffunction-sections \
 	-fdata-sections
@@ -46,7 +47,6 @@ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
 	-e 's,@libdir\@,$(libdir),g' \
 	-e 's,@includedir\@,$(includedir),g' \
 	-e 's,@bindir\@,$(bindir),g' \
-	-e 's,@sbindir\@,$(sbindir),g' \
 	-e 's,@libexecdir\@,$(libexecdir),g' \
 	< $< > $@ || rm $@
 
@@ -144,19 +144,9 @@ 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/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
-
-CLEANFILES += \
 	rules/rules.d/80-drivers.rules \
-	rules/rules.d/60-persistent-storage.rules
+	rules/rules.d/95-udev-late.rules
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
@@ -218,11 +208,13 @@ udev_common_sources = \
 	udev/udev-builtin-kmod.c
 
 udev_common_CFLAGS = \
-	$(BLKID_CFLAGS)
+	$(BLKID_CFLAGS) \
+	$(KMOD_CFLAGS)
 
 udev_common_LDADD = \
 	libudev/libudev-private.la \
-	$(BLKID_LIBS)
+	$(BLKID_LIBS) \
+	$(BLKID_KMOD)
 
 udev_udevd_SOURCES = \
 	$(udev_common_sources) \
@@ -284,7 +276,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
@@ -641,10 +634,8 @@ extras_mtd_probe_mtd_probe_SOURCES =  \
 	extras/mtd_probe/mtd_probe.h \
 	extras/mtd_probe/probe_smartmedia.c
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
 libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-EXTRA_DIST += extras/mtd_probe/75-probe_mtd.rules.in
-CLEANFILES += extras/mtd_probe/75-probe_mtd.rules
 endif
 
 if ENABLE_RULE_GENERATOR