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 <stefano.lattarini@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index c4544bbd7b20b6445a2637445ebdb62a6fb0b1ba..047d6860afe25eb0fcd6776db77a83665f76f355 100644 (file)
--- 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 c4ed17f70843ec99321e7eb2883d022dceddaf7b..f3531b6626e59fa077ddd11bb4d7cca64e56c8f0 100644 (file)
--- 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 754e15bb18556aacc133bbddeae8f50b6add4b37..c5a606a287f7667e31866c7b229c20d4f5be9fa0 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
-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.  ##