From: Stefano Lattarini Date: Sun, 5 May 2013 19:26:15 +0000 (+0200) Subject: build: fixup: don't define ETAGS_ARGS multiple times X-Git-Tag: v2.69b~140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa18cbafd87930acc7487d5836ead7acd6c3af90;p=thirdparty%2Fautoconf.git build: fixup: don't define ETAGS_ARGS multiple times * Makefile.am (ETAGS_ARGS): Define to empty, to be updated later. * bin/local.mk (ETAGS_ARGS): Append to it, rather than re-defining it. * lib/local.mk (ETAGS_ARGS): Likewise. Also, do not bother appending "--lang=perl" once again, as that is already done in 'bin/local.mk'. Signed-off-by: Stefano Lattarini --- diff --git a/Makefile.am b/Makefile.am index c4544bbd..047d6860 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = . tests man ACLOCAL_AMFLAGS = -I m4 +## All of these will be incrementally updated later, here or in included +## makefile fragments. +ETAGS_ARGS = MOSTLYCLEANFILES = CLEANFILES = diff --git a/bin/local.mk b/bin/local.mk index c4ed17f7..f3531b66 100644 --- a/bin/local.mk +++ b/bin/local.mk @@ -91,4 +91,4 @@ ETAGS_PERL = --lang=perl \ ETAGS_SH = --lang=none --regex='/\($(WORD_REGEXP)\)=/\1/' \ bin/autoconf.in -ETAGS_ARGS = $(ETAGS_PERL) $(ETAGS_SH) +ETAGS_ARGS += $(ETAGS_PERL) $(ETAGS_SH) diff --git a/lib/local.mk b/lib/local.mk index 754e15bb..c5a606a2 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF) +ETAGS_ARGS += $(ETAGS_FOR_AUTOCONF) TAGS_FILES = # Incrementally updated later. # Additional checks. @@ -41,7 +41,7 @@ dist_perllib_DATA = \ lib/Autom4te/XFile.pm TAGS_FILES += $(dist_perllib_DATA) -ETAGS_ARGS += --lang=perl +# Note: ETAGS_ARGS should have already been extended to handle perl files. ## ------------------------------------------ ## ## Make Autom4te default configuration file. ##