Fix for libtool2.test:

	* tests/libtool2.test: Use `rm -f' to placate maintainer-check.
	* lib/am/libtool.am (distclean-libtool): Conditional on TOPDIR.
	* automake.in (generate_makefile): Call handle_libtool
	unconditionally.
	* tests/Makefile.am (XFAIL_TESTS): Removed libtool2.test.

diff --git a/ChangeLog b/ChangeLog
index bf8f449775c62d931e151dd2d6d9e3980e192f10..d292bbf18655dc083dc39d57541616380857e508 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2001-07-02  Tom Tromey  <tromey@redhat.com>
 
+       Fix for libtool2.test:
+       * tests/libtool2.test: Use `rm -f' to placate maintainer-check.
+       * lib/am/libtool.am (distclean-libtool): Conditional on TOPDIR.
+       * automake.in (generate_makefile): Call handle_libtool
+       unconditionally.
+       * tests/Makefile.am (XFAIL_TESTS): Removed libtool2.test.
+
        * tests/libtool2.test: Look for `.lo' files to be removed.
 
        * tests/Makefile.am (XFAIL_TESTS): Added libtool2.test.

diff --git a/automake.in b/automake.in
index b84b35f5765cfd76c4afd4233030cf3d08a4e82b..74df0f3353f3d1f60f20d9d96a4ddba162b65c9e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1194,12 +1194,12 @@ sub generate_makefile
        }
     }
 
+    &handle_libtool;
+
     # At the toplevel directory, we might need config.guess, config.sub
     # or libtool scripts (ltconfig and ltmain.sh).
     if ($relative_dir eq '.')
     {
-       &handle_libtool;
-
         # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and
         # config.sub.
         &require_config_file ($FOREIGN, 'config.guess', 'config.sub')
@@ -2389,14 +2389,16 @@ sub handle_compile ()
 
 # handle_libtool ()
 # -----------------
-# Handle libtool rules.  Only called when RELATIVE_DIR is `.'.
+# Handle libtool rules.
 sub handle_libtool
 {
     return unless $seen_libtool;
 
-    # libtool requires some files.
+    # libtool requires some files, but only at top level.
     &require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
-                                      @libtoolize_files);
+                                      @libtoolize_files)
+       if $relative_dir eq '.';
+
     # Output the libtool compilation rules.
     $output_rules .= &file_contents ('libtool');
 }

diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 71ae829aa3bdb2f6fc4986b2ab3c2f5d152e93a0..deff4b56761138d00cd1314110bdf42cc10c1db3 100644 (file)
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -27,6 +27,6 @@ clean-libtool:
 ## .libs is for Unix, _libs for DOS.
        -rm -rf .libs _libs
 
-distclean-am: distclean-libtool
-distclean-libtool:
-       -rm -f libtool
+?TOPDIR?distclean-am: distclean-libtool
+?TOPDIR?distclean-libtool:
+?TOPDIR?       -rm -f libtool

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f0f3584a2cb81dc20ee43f5fdb542d2fb1928a56..74857ad0499f44cd1b5f0e749f8fa88343fb2e21 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = libtool2.test subdir5.test
+XFAIL_TESTS = subdir5.test
 
 TESTS =        \
 acinclude.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 68dcdfce987e183848d17dd2428743952be3c2b4..175b08a92fb440ae30128034909730d46502e88c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,7 @@ _am_include = @_am_include@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = libtool2.test subdir5.test
+XFAIL_TESTS = subdir5.test
 
 TESTS = \
 acinclude.test \

diff --git a/tests/libtool2.test b/tests/libtool2.test
index 19f2a0a399cc13879c7854965f9a1196ec0811f2..21a582d1e34deca7a883f2ade4ebc4d161dd475f 100755 (executable)
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -35,4 +35,4 @@ $ACLOCAL || exit 1
 : > ltmain.sh
 $AUTOMAKE -a || exit 1
 
-grep 'rm .*\.lo' sub/Makefile.in
+grep 'rm -f .*\.lo' sub/Makefile.in