[PATCH v2 14/17] build: fixup: don't define ETAGS_ARGS multiple times

[Stefano Lattarini]

* 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 <address@hidden>
---
 Makefile.am  | 3 +++
 bin/local.mk | 2 +-
 lib/local.mk | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c4544bb..047d686 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 c4ed17f..f3531b6 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 754e15b..c5a606a 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 <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.  ##
-- 
1.8.3.rc0.19.g7e6a0cc