X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=769a6f5001a192500fe4454592bd97499fb49a27;hp=eb9ee9313503b36f622724622082459d5a603410;hb=57f4ef67aa4e517e4ee1b79360169f5544f72379;hpb=e216e514cf0c3bc6352f43fa3a7ffad221200bca

diff --git a/Makefile.am b/Makefile.am
index eb9ee9313..769a6f500 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
@@ -211,18 +201,25 @@ udev_common_sources = \
 	udev/udev-rules.c \
 	udev/udev-ctrl.c \
 	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-blkid.c \
-	udev/udev-builtin-kmod.c
+	udev/udev-builtin-firmware.c \
+	udev/udev-builtin-input_id.c \
+	udev/udev-builtin-kmod.c \
+	udev/udev-builtin-path_id.c \
+	udev/udev-builtin-usb_id.c
 
 udev_common_CFLAGS = \
-	$(BLKID_CFLAGS)
+	$(BLKID_CFLAGS) \
+	$(KMOD_CFLAGS)
 
 udev_common_LDADD = \
 	libudev/libudev-private.la \
-	$(BLKID_LIBS)
+	$(BLKID_LIBS) \
+	$(KMOD_LIBS)
+
+udev_common_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 
 udev_udevd_SOURCES = \
 	$(udev_common_sources) \
@@ -231,6 +228,7 @@ udev_udevd_SOURCES = \
 	udev/sd-daemon.c
 udev_udevd_CFLAGS = $(udev_common_CFLAGS)
 udev_udevd_LDADD = $(udev_common_LDADD)
+udev_udevd_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 udev_udevadm_SOURCES = \
 	$(udev_common_sources) \
@@ -244,6 +242,7 @@ udev_udevadm_SOURCES = \
 	udev/udevadm-test-builtin.c
 udev_udevadm_CFLAGS = $(udev_common_CFLAGS)
 udev_udevadm_LDADD = $(udev_common_LDADD)
+udev_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 # ------------------------------------------------------------------------------
 # udev man pages
@@ -286,15 +285,7 @@ udev_test_udev_SOURCES = \
 	udev/test-udev.c
 udev_test_udev_CFLAGS = $(udev_common_CFLAGS)
 udev_test_udev_LDADD = $(udev_common_LDADD)
-
-# ------------------------------------------------------------------------------
-# firmware - firmware loading
-# ------------------------------------------------------------------------------
-extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
-extras_firmware_firmware_LDADD = libudev/libudev-private.la
-extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
-dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS += extras/firmware/firmware
+udev_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
@@ -642,10 +633,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