[PATCH] build-sys: don't duplicate file names

[PATCH] build-sys: don't duplicate file names

[Karel Zak]

Almost all filenames in udev/Makefile.am are duplicated in
{udevd,udevadm,test_udev}_SOURCE lists.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 udev/Makefile.am |   75 +++++++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 6402f23..3d28546 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -9,15 +9,15 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DUDEV_PREFIX=\""$(udev_prefix)"\"
 
-udevd_SOURCES = \
+common_ldadd +
+common_files = \
 	list.h \
 	logging.h \
 	udev.h \
 	udev_rules.h \
 	udev_selinux.h \
 	udev_sysdeps.h \
-	udevd.h \
-	udevd.c \
 	udev_config.c \
 	udev_db.c \
 	udev_device.c \
@@ -29,73 +29,46 @@ udevd_SOURCES = \
 	udev_utils.c \
 	udev_utils_file.c \
 	udev_utils_string.c
+
+
 if USE_SELINUX
-udevd_SOURCES += \
+common_files += \
 	udev_selinux.c
 
-udevd_LDADD = \
+common_ldadd += \
 	$(SELINUX_LIBS)
 endif
 
+udevd_SOURCES = \
+	$(common_files) \
+	udevd.h \
+	udevd.c
+
+udevd_LDADD = \
+	$(common_ldadd)
+
+
 udevadm_SOURCES = \
-	list.h \
-	logging.h \
-	udev.h \
-	udev_rules.h \
-	udev_selinux.h \
-	udev_sysdeps.h \
+	$(common_files) \
 	udevadm.c \
 	udevinfo.c \
 	udevcontrol.c \
 	udevtest.c \
 	udevmonitor.c \
 	udevsettle.c \
-	udevtrigger.c \
-	udev_config.c \
-	udev_db.c \
-	udev_device.c \
-	udev_node.c \
-	udev_rules.c \
-	udev_rules_parse.c \
-	udev_sysdeps.c \
-	udev_sysfs.c \
-	udev_utils.c \
-	udev_utils_file.c \
-	udev_utils_string.c
-if USE_SELINUX
-udevadm_SOURCES += \
-	udev_selinux.c
+	udevtrigger.c
 
 udevadm_LDADD = \
-	$(SELINUX_LIBS)
-endif
+	$(common_ldadd)
+
 
 test_udev_SOURCES = \
-	list.h \
-	logging.h \
-	udev.h \
-	udev_rules.h \
-	udev_selinux.h \
-	udev_sysdeps.h \
-	test-udev.c \
-	udev_config.c \
-	udev_db.c \
-	udev_device.c \
-	udev_node.c \
-	udev_rules.c \
-	udev_rules_parse.c \
-	udev_sysdeps.c \
-	udev_sysfs.c \
-	udev_utils.c \
-	udev_utils_file.c \
-	udev_utils_string.c
-if USE_SELINUX
-test_udev_SOURCES += \
-	udev_selinux.c
+	$(common_files) \
+	test-udev.c
 
 test_udev_LDADD = \
-	$(SELINUX_LIBS)
-endif
+	$(common_ldadd)
+
 
 dist_man_MANS = \
 	udev.7 \
-- 
1.5.5.1

Re: [PATCH] build-sys: don't duplicate file names

[Kay Sievers]

On Wed, 2008-08-13 at 00:01 +0200, Karel Zak wrote:
> Almost all filenames in udev/Makefile.am are duplicated in
> {udevd,udevadm,test_udev}_SOURCE lists.

Ah, nice. Thanks! Applied.

Kay