From 70fd601f199e1a1d3007b3a37ee91279dec70d35 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 3 Jul 2001 04:19:35 +0000
Subject: [PATCH] 	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.

---
 ChangeLog           |  7 +++++++
 automake.in         | 12 +++++++-----
 lib/am/libtool.am   |  6 +++---
 tests/Makefile.am   |  2 +-
 tests/Makefile.in   |  2 +-
 tests/libtool2.test |  2 +-
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf8f4497..d292bbf1 100644
--- 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 b84b35f5..74df0f33 100755
--- 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 71ae829a..deff4b56 100644
--- 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 f0f3584a..74857ad0 100644
--- 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 68dcdfce..175b08a9 100644
--- 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 19f2a0a3..21a582d1 100755
--- 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
-- 
2.43.5