[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: fix libtool.test
From: |
Tom Tromey |
Subject: |
Patch: fix libtool.test |
Date: |
17 Jun 2001 13:18:44 -0600 |
I'm checking this in. It fixes libtool.test.
2001-06-17 Tom Tromey <address@hidden>
Fix for libtool.test:
* automake.in (generate_makefile): Call handle_libtool.
(handle_libtool): New sub.
(handle_compile): Don't read `libtool' file.
Tom
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1139
diff -u -r1.1139 automake.in
--- automake.in 2001/06/15 01:25:11 1.1139
+++ automake.in 2001/06/17 19:01:17
@@ -1174,10 +1174,7 @@
# or libtool scripts (ltconfig and ltmain.sh).
if ($relative_dir eq '.')
{
- # libtool requires some files.
- &require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
- @libtoolize_files)
- if $seen_libtool;
+ &handle_libtool;
# AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and
# config.sub.
@@ -2276,12 +2273,6 @@
$output_vars .= $vars;
$output_rules .= "$coms$rules";
- if ($seen_libtool)
- {
- # Output the libtool compilation rules.
- $output_rules .= &file_contents ('libtool');
- }
-
# Check for automatic de-ANSI-fication.
if (defined $options{'ansi2knr'})
{
@@ -2316,7 +2307,19 @@
}
}
+# handle_libtool ()
+# -----------------
+# Handle libtool rules. Only called when RELATIVE_DIR is `.'.
+sub handle_libtool
+{
+ return unless $seen_libtool;
+ # libtool requires some files.
+ &require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
+ @libtoolize_files);
+ # Output the libtool compilation rules.
+ $output_rules .= &file_contents ('libtool');
+}
# handle_programs ()
# ------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: fix libtool.test,
Tom Tromey <=