bug fixes

diff --git a/ChangeLog b/ChangeLog
index 084ba93e54ff02d007fe4569eb9039f4df57405f..f32d9f8b8d7c3d6aa431d0c77be73b21334c0921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Apr 15 12:12:28 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_subdirs): Typo fix.  From Akim Demaille.
+
+       * automake.in (handle_tags): Only use SUBDIRS if it is actually
+       defined.  Report from Ian Taylor.
+
+       * tags.am: Added prefix to SUBDIRS rules.
+
 Wed Apr  9 17:09:40 1997  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_ltlibraries): Use correct rpath

diff --git a/THANKS b/THANKS
index 409dc61430eec1f7139c6c4cb0f27db69d22cd7c..7996b6b843a204c4b6c4e5168eed15909207f2da 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+Akim Demaille <demaille@inf.enst.fr>
 Alexander V. Lukyanov <lav@yars.free.net>
 Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Anthony Green <green@cygnus.com>
@@ -17,6 +18,7 @@ Gord Matzigkeit <gord@gnu.ai.mit.edu>
 Greg A. Woods <woods@most.weird.com>
 Harlan Stenn <Harlan.Stenn@pfcs.com>
 Henrik Frystyk Nielsen <frystyk@w3.org>
+Ian Lance Taylor <ian@cygnus.com>
 Janos Farkas <chexum@shadow.banki.hu>
 Jason Molenda <crash@cygnus.co.jp>
 Jerome Santini <santini@chambord.univ-orleans.fr>

diff --git a/TODO b/TODO
index e5daedfcae74df8b3491486caddb7227ecc1d1b7..91e9a2dd92834cb69166faab4a67582dae4b4c5c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,18 @@
+** make sure every variable that is used is also defined
+
+* make sure `missing' defines are generated
+* if no AM_INIT_AUTOMAKE, then don't handle `missing' stuff.
+  Yuck!
+
+* allow 'cygnus' in AUTOMAKE_OPTIONS
+
+
+
 * NORMAL_INSTALL / NORMAL_UNINSTALL -vs- recursive rules
   [ requires changes to the standard ]
 
+* if foo.y is a source, foo.h isn't auto-distributed?
+
 * dependency tracking doesn't work well when a file is removed
   the new code to track header dependencies exacerbates this
   what is the fix?
@@ -9,8 +21,6 @@
   as a side effect of compilation
   This still won't solve the file-deletion problem
 
-* make sure `missing' defines are generated
-
 * copyrights on m4 files, aclocal output
 
 * is there a way to add a directory and then have "make" do all the
@@ -18,8 +28,6 @@
 
 * put standards.texi into distribution
 
-* if no AM_INIT_AUTOMAKE, then don't handle `missing' stuff.
-  Yuck!
 
 * should not put texiname_TEXINFOS into distribution
   should rename this macro anyway, to foo_texi_DEPENDENCIES

diff --git a/automake.in b/automake.in
index 73062a59dac89cc8f311861bf82f53a3f0a8b8d6..3652c48cc792bd1059af2cb2ed914e26d4a3ac7a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2098,6 +2098,15 @@ sub handle_tags
        $xform = ('s/\@CONFIG\@/' . $xform . '/;'
                  . 's/\@DIRS\@/' . join (' ', @tag_deps) . '/;');
 
+       if (&variable_defined ('SUBDIRS'))
+       {
+           $xform .= 's/^SUBDIRS//;';
+       }
+       else
+       {
+           $xform .= 's/^SUBDIRS.*$//;';
+       }
+
        $output_rules .= &file_contents_with_transform ($xform, 'tags');
        $output_rules .= &file_contents ('tags-clean');
        push (@clean, 'tags');
@@ -2573,8 +2582,7 @@ sub handle_subdirs
            next;
        }
 
-       &am_relative_dir ('SUBDIRS',
-                         "directory should not contain \`/'")
+       &am_line_error ('SUBDIRS', "directory should not contain \`/'")
            if $dir =~ /\//;
     }
 

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 989c2190c240bafbc38aba570219f73748509939..7cd8561743a2a9a19cb179d021aba66a996f8cfe 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -23,11 +23,9 @@ ID: $(HEADERS) $(SOURCES)
 TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES)
        tags=; \
        here=`pwd`; \
-## It is ok to examine SUBDIRS here in every case; if it is empty,
-## there is a slight performance hit.  But we don't care.
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-       done; \
+SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
+SUBDIRS          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+SUBDIRS        done; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$(SOURCES)$(HEADERS)$$tags" \
          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $(SOURCES) $(HEADERS) -o $$here/TAGS)

diff --git a/tags.am b/tags.am
index 989c2190c240bafbc38aba570219f73748509939..7cd8561743a2a9a19cb179d021aba66a996f8cfe 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -23,11 +23,9 @@ ID: $(HEADERS) $(SOURCES)
 TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES)
        tags=; \
        here=`pwd`; \
-## It is ok to examine SUBDIRS here in every case; if it is empty,
-## there is a slight performance hit.  But we don't care.
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-       done; \
+SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
+SUBDIRS          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+SUBDIRS        done; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$(SOURCES)$(HEADERS)$$tags" \
          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $(SOURCES) $(HEADERS) -o $$here/TAGS)