Fixed EXTRA_ problems

diff --git a/ChangeLog b/ChangeLog
index d92d7b1..3d4a22a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 14 10:24:30 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (am_install_var): Fixed problem in EXTRA_ handling.
+       Test extra.test.
+
 Mon May 13 10:41:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * install-sh (transformbasename): Correct misspelling of

diff --git a/automake.in b/automake.in
index 62a32fd..ecc01a6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2644,8 +2644,6 @@ sub am_install_var
            }
        }
     }
-    # We never want to examine EXTRA_blah.
-    delete $valid{'EXTRA'};
 
     local ($clean_file) = $file . '-clean';
     local ($one_name);
@@ -2665,6 +2663,10 @@ sub am_install_var
                push (@result, $rcurs);
            }
 
+           # "EXTRA" shouldn't be used when generating clean targets,
+           # @all, or install targets.
+           next if $X eq 'EXTRA';
+
            if ($do_clean)
            {
                $output_rules .=
@@ -2685,8 +2687,7 @@ sub am_install_var
            }
            if ($X eq 'noinst' || $X eq 'check')
            {
-               # Objects in noinst_FOO or check_FOO never get
-               # installed.
+               # Objects which don't get installed by default.
                next;
            }
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index cb5a809..3e140ae 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 14 10:17:17 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * extra.test: Reversed sense of test.
+
 Fri Apr 26 15:15:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * instman.test: New file.

diff --git a/tests/extra.test b/tests/extra.test
index 014f171..49bf5ac 100755 (executable)
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-# Test to make sure EXTRA_ targets are not generated.
+# Test to make sure EXTRA_ targets are generated.  This test used to
+# make sure the targets were *not* generated.  That is wrong; the
+# targets should always be generated.  However, they should not be
+# built by default.
 
 . $srcdir/defs || exit 1
 
@@ -11,5 +14,8 @@ END
 
 $AUTOMAKE || exit 1
 
-grep "^zardoz" Makefile.in && exit 1
+grep "^zardoz" Makefile.in || exit 1
+
+# Can't have EXTRA clean rules.
+grep 'clean.*EXTRA' Makefile.in && exit 1
 exit 0