+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
}
}
}
- # We never want to examine EXTRA_blah.
- delete $valid{'EXTRA'};
local ($clean_file) = $file . '-clean';
local ($one_name);
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 .=
}
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;
}
+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.
#! /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
$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