[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI 2/2] tags: refactor to reduce code duplication (2)
From: |
Stefano Lattarini |
Subject: |
[FYI 2/2] tags: refactor to reduce code duplication (2) |
Date: |
Tue, 24 Jul 2012 20:33:14 +0200 |
No semantic change is intended.
* lib/am/tags.am (am__define_uniq_tagged_files): New variable,
factor out some code common to ...
(ctags-am, tags-am, ID): ... the recipes of these targets.
Signed-off-by: Stefano Lattarini <address@hidden>
---
lib/am/tags.am | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 28338a7..730ccc5 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -23,18 +23,22 @@ am__uniquify_input = $(AWK) '\
END { if (nonempty) { for (i in items) print i; }; } \
'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+## Handle VPATH correctly.
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+
## ---- ##
## ID. ##
## ---- ##
ID: $(am__tagged_files)
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`;
- mkid -fID $$unique
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
## ------ ##
@@ -77,12 +81,7 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
?SUBDIRS? set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
?SUBDIRS? fi; \
?SUBDIRS? done; \
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`; \
+ $(am__define_uniq_tagged_files); \
## Remove the 'x' we added first:
shift; \
## Make sure we have something to run etags on.
@@ -114,12 +113,7 @@ endif !%?SUBDIRS%
CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`; \
+ $(am__define_uniq_tagged_files); \
## Make sure we have something to run ctags on.
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--
1.7.12.rc0