From: Karel Zak <kzak@redhat.com>
To: linux-hotplug@vger.kernel.org
Subject: [PATCH] build-sys: don't duplicate file names
Date: Tue, 12 Aug 2008 22:01:44 +0000 [thread overview]
Message-ID: <1218578507-28586-1-git-send-email-kzak@redhat.com> (raw)
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
next reply other threads:[~2008-08-12 22:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 22:01 Karel Zak [this message]
2008-08-13 10:01 ` [PATCH] build-sys: don't duplicate file names Kay Sievers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1218578507-28586-1-git-send-email-kzak@redhat.com \
--to=kzak@redhat.com \
--cc=linux-hotplug@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox