automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch: libtool2.test fix


From: Tom Tromey
Subject: Patch: libtool2.test fix
Date: 02 Jul 2001 22:39:48 -0600

I'm checking this in.  It fixes libtool2.test.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        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.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1145
diff -u -r1.1145 automake.in
--- automake.in 2001/07/01 22:51:38 1.1145
+++ automake.in 2001/07/03 03:53:36
@@ -1194,12 +1194,12 @@
        }
     }
 
+    &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 @@
 
 # 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');
 }
Index: lib/am/libtool.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/libtool.am,v
retrieving revision 1.12
diff -u -r1.12 libtool.am
--- lib/am/libtool.am 2001/04/09 14:46:45 1.12
+++ lib/am/libtool.am 2001/07/03 03:53:36
@@ -27,6 +27,6 @@
 ## .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
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.318
diff -u -r1.318 Makefile.am
--- tests/Makefile.am 2001/07/02 20:14:34 1.318
+++ tests/Makefile.am 2001/07/03 03:53:36
@@ -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 \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.417
diff -u -r1.417 Makefile.in
--- tests/Makefile.in 2001/07/02 20:14:34 1.417
+++ tests/Makefile.in 2001/07/03 03:53:36
@@ -66,7 +66,7 @@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = libtool2.test subdir5.test
+XFAIL_TESTS = subdir5.test
 
 TESTS = \
 acinclude.test \
Index: tests/libtool2.test
===================================================================
RCS file: /cvs/automake/automake/tests/libtool2.test,v
retrieving revision 1.2
diff -u -r1.2 libtool2.test
--- tests/libtool2.test 2001/07/03 03:47:56 1.2
+++ tests/libtool2.test 2001/07/03 03:53:36
@@ -35,4 +35,4 @@
 : > ltmain.sh
 $AUTOMAKE -a || exit 1
 
-grep 'rm .*\.lo' sub/Makefile.in
+grep 'rm -f .*\.lo' sub/Makefile.in



reply via email to

[Prev in Thread] Current Thread [Next in Thread]