* lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.

* lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
* lib/am/java.am (JAVACFLAGS): Remove.
* tests/dejagnu3.test: Check that the environment value
of RUNTESTFLAGS get passed down to runtest.
Suggested by Mark Mitchell.

diff --git a/ChangeLog b/ChangeLog
index a4481a447d23644f52d66e36cb772ddebce4ef56..b0aaf657a1b035fc58ef73104fefc4f771836d5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-11-08  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.
+       * lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
+       * lib/am/java.am (JAVACFLAGS): Remove.
+       * tests/dejagnu3.test: Check that the environment value
+       of RUNTESTFLAGS get passed down to runtest.
+       Suggested by Mark Mitchell.
+
        * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
        (?GENERIC?%EXT%.lo): Do not echo compile command manually, this
        breaks `make -s'.  Instead, fold the compile command on two lines,

diff --git a/Makefile.in b/Makefile.in
index 4b2e757d620c454527f50c03c7b10818ea557168..951d3bc1b9aff9d37ed606f00b09e847a7724383 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,9 +63,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        pdf-recursive ps-recursive uninstall-info-recursive \
        uninstall-recursive
 ETAGS = etags
-ETAGSFLAGS = 
 CTAGS = ctags
-CTAGSFLAGS = 
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -280,8 +278,6 @@ ctags-recursive:
          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
        done
 
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -290,6 +286,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -315,7 +312,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        test -z "$(ETAGS_ARGS)$$tags$$unique" \
          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
             $$tags $$unique
-
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/NEWS b/NEWS
index d1e9fb82df3aca1753b7bb5064e73ff91ebd4191..8e8139040f13aab9dc1484b644d5815290059dea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -199,6 +199,12 @@ New in 1.7a:
          core dump files.  A core file on one system might be a
         completely legitimate data file on another system.
 
+  - RUNTESTFLAGS, CTAGSFLAGS, ETAGSFLAGS, JAVACFLAGS are no longer
+    defined by Automake.  This means that any definition in the
+    environment will be used, unless overridden in the Makefile.am or
+    on the command line.  The old behavior, where these variables were
+    defined empty in each Makefile, can be obtained by AC_SUBSTing or
+    AC_ARG_VARing each variable from configure.ac.
 \f
 New in 1.7:
 * Autoconf 2.54 is required.

diff --git a/THANKS b/THANKS
index 2489480a20ea05feff8bec18c91eb3f09cbdb13e..dd71c4f23c2db5f52da3ac01379cd3a80397a046 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -133,6 +133,7 @@ Marius Vollmer              mvo@zagadka.ping.de
 Mark Eichin            eichin@cygnus.com
 Mark Elbrecht          snowball3@bigfoot.com
 Mark Galassi           rosalia@nis.lanl.gov
+Mark Mitchell          mark@codesourcery.com
 Markku Rossi           mtr@ngs.fi
 Markus F.X.J. Oberhumer        k3040e4@wildsau.idv-edu.uni-linz.ac.at
 Martin Frydl           martin@idoox.com

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c19e04a0b728ef392850c3b35903871ea04c2fcb..bf358a50cacde94da22f795d915474ebaeec5e22 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -62,9 +62,7 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 DVIPS = dvips
 am__installdirs = $(DESTDIR)$(infodir)
 ETAGS = etags
-ETAGSFLAGS = 
 CTAGS = ctags
-CTAGSFLAGS = 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -286,8 +284,6 @@ maintainer-clean-aminfo:
          rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
        done
 
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -296,6 +292,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -310,7 +307,6 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        test -z "$(ETAGS_ARGS)$$tags$$unique" \
          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
             $$tags $$unique
-
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 731b305dbddaa9b7dddb67db7570bd7db4a3b947..9e94c335ece9059d4a97eea2ee1ed1997b575f01 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -60,9 +60,7 @@ dist_perllibDATA_INSTALL = $(INSTALL_DATA)
 nodist_perllibDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_perllib_DATA) $(nodist_perllib_DATA)
 ETAGS = etags
-ETAGSFLAGS = 
 CTAGS = ctags
-CTAGSFLAGS = 
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -289,8 +287,6 @@ ctags-recursive:
          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
        done
 
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -299,6 +295,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -324,7 +321,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        test -z "$(ETAGS_ARGS)$$tags$$unique" \
          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
             $$tags $$unique
-
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index ef8aba30c4c3f1feca1d7a972f1b69b53add9dc8..a746b792e2dfbfa1583fcfd70a9d98cb10b63c3e 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -64,9 +64,7 @@ dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA)
 dist_scriptDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA)
 ETAGS = etags
-ETAGSFLAGS = 
 CTAGS = ctags
-CTAGSFLAGS = 
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -265,8 +263,6 @@ ctags-recursive:
          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
        done
 
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
@@ -275,6 +271,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -300,7 +297,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        test -z "$(ETAGS_ARGS)$$tags$$unique" \
          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
             $$tags $$unique
-
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index e220b9359ed735f4c52e69d7acce59deb2e8a7c0..652849ffb49ca8e6533d59e518b8258e87a81c87 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -17,9 +17,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Flags for DejaGnu.
-RUNTESTFLAGS =
-
 ## Name of tool to use.  Default is the same as the package.
 DEJATOOL = $(PACKAGE)
 

diff --git a/lib/am/java.am b/lib/am/java.am
index 2eddcda5639fc344a6e5c54216b5274b9c060583..7b526b3338f77ba0b2e72d9a32618ad019f9d53b 100644 (file)
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -22,7 +22,6 @@
 ## ---------- ##
 
 JAVAC = javac
-JAVACFLAGS =
 CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
 JAVAROOT = $(top_builddir)
 

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 10d06644e3612ad8e6d4e8e1d3e338a46ed171ab..723e9c341ac423db31637e8ccfe49cc452e62c04 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -17,10 +17,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-.PHONY: tags
-tags: TAGS
-
-
 ## ---- ##
 ## ID.  ##
 ## ---- ##
@@ -42,7 +38,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## ------ ##
 
 ETAGS = etags
-ETAGSFLAGS =
+.PHONY: tags
+tags: TAGS
 
 TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -84,8 +81,6 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
 ## ------------- ##
 
 CTAGS = ctags
-CTAGSFLAGS =
-
 .PHONY: CTAGS ctags
 ctags: CTAGS
 

diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
index cad06a32adfe0a19fed61147247f4b64dd59d2af..ee1daf70230eca7bb11625558625b7be581343d2 100755 (executable)
--- a/tests/dejagnu3.test
+++ b/tests/dejagnu3.test
@@ -66,3 +66,8 @@ test -f hammer.log
 test -f hammer.sum
 
 $MAKE distcheck
+
+# Ensure that the envvar RUNTESTFLAGS is used.
+# Report from Mark Mitchell.
+RUNTESTFLAGS=--unknown-option $MAKE check && exit 1
+exit 0