really fixed tags

diff --git a/automake.in b/automake.in
index 5a93b0c..62b31bb 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1865,7 +1865,8 @@ sub handle_tags
 
     if ($dir_holds_sources
        || $dir_holds_headers
-       || &variable_defined ('ETAGS_ARGS'))
+       || &variable_defined ('ETAGS_ARGS')
+       || @tag_deps)
     {
        local ($xform) = '';
        if ($config_header && $relative_dir eq &dirname ($config_header))
@@ -1892,8 +1893,7 @@ sub handle_tags
        # Every Makefile must define some sort of TAGS rule.
        # Otherwise, it would be possible for a top-level "make TAGS"
        # to fail because some subdirectory failed.
-       $output_rules .= ("tags: " . join (' ', @tags_deps)
-                         . " TAGS\nTAGS:\n\n");
+       $output_rules .= ("tags: TAGS\nTAGS:\n\n");
     }
 }
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 04282c5..dcefe6d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 26 13:05:42 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * tagsub.test: New file.
+
 Sun Feb 23 11:58:00 1997  Tom Tromey  <tromey@cygnus.com>
 
        * texinfo.test, texinfo2.test, texinfo3.test, info.test,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80b93dc..bafa66a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test
+defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1d90889..0daa493 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1m from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -66,7 +66,7 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test
+defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -74,9 +74,8 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP = --best
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+       $(TEXINFOS) $(MANS) $(EXTRA_DIST)
 default: all
 
 .SUFFIXES:

diff --git a/tests/tagsub.test b/tests/tagsub.test
new file mode 100755 (executable)
index 0000000..805e8d3
--- /dev/null
+++ b/tests/tagsub.test
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+# Test to make sure tags and subdirs work correctly.  Bug report by
+# François Pinard.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+
+cat > sub/Makefile.am << 'END'
+noinst_HEADERS = iguana.h
+END
+
+: > sub/iguana.h
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
+AM_PROG_INSTALL
+AC_OUTPUT(Makefile sub/Makefile)
+END
+
+$AUTOMAKE || exit 1
+
+grep '^TAGS:.*tags-recursive' Makefile.in