summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2008-08-13 00:01:44 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-08-13 11:12:53 +0200
commita3b55b1c4744ab0e7f78057db04f6832688a5a3f (patch)
treecfdd8e187bad331afde4aeacaf4861c94a93482e
parente231a5db51f1b21252b2404d0aa2f243baa87a1a (diff)
build-sys: don't duplicate file names
Almost all filenames in udev/Makefile.am are duplicated in {udevd,udevadm,test_udev}_SOURCE lists. Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--udev/Makefile.am75
1 files changed, 24 insertions, 51 deletions
diff --git a/udev/Makefile.am b/udev/Makefile.am
index 6402f231f9..3d285462a9 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 \