* automake.in (finish_languages): Always use `-o $@' with

	libtool.  Define ltcompile and ltlink at outermost scope in
	function.
	* libtool.am (.c.lo): Removed.

diff --git a/ChangeLog b/ChangeLog
index ead0ac0947508050b44ebe09844f9c32888adb9e..f853138969998fbc10d5cd21d75230a221d047c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-04-30  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (finish_languages): Always use `-o $@' with
+       libtool.  Define ltcompile and ltlink at outermost scope in
+       function.
+       * libtool.am (.c.lo): Removed.
+
        * automake.in (finish_languages): Put `.' before extension in
        suffix list, `.obj' rule, and `.lo' rule.  Look at `-flags', not
        `-flag'.  From Pavel Roskin.

diff --git a/TODO b/TODO
index cab64061720e4d5e6ded5d1e685f3c491b9b2209..1ed48fa977606c9ebdaa623730fd4315d5f9dad4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+* Scan configure.in using the same trick that autoheader uses.
+  This will be much more reliable.
+
 * Test subdir-objects option with yacc, lex, ansi2knr
   Our locking scheme won't prevent a parallel make from losing
   if there are two `bar.o' files and the timing is just right

diff --git a/automake.in b/automake.in
index a557ea143f5212ef2fff9cb31d0b2a3328c8c4e4..1718c1f013e32cff15b9f51ee7fbbc6e0ea186e2 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -971,6 +971,8 @@ sub get_object_extension
 # Call finish function for each language that was used.
 sub finish_languages
 {
+    local ($ltcompile, $ltlink) = &libtool_compiler;
+
     local ($ext, $name, $lang, %done);
     local ($non_c) = 1;
     foreach $ext (sort keys %extension_seen)
@@ -1009,7 +1011,10 @@ sub finish_languages
                              . "\t\$(LT"
                              . $language_map{$lang . '-compiler-name'}
                              . ") "
-                             . $outarg
+                             . $language_map{$lang . '-output-arg'}
+                             # We can always use -c -o with libtool.
+                             . ($language_map{$lang . '-flags'} eq 'CFLAGS'
+                                ? ' -o $@' : '')
                              . " \$<\n")
                if $seen_libtool;
        }
@@ -1043,8 +1048,6 @@ sub finish_languages
     # it.
     if (! $non_c || scalar keys %suffix_rules > 0)
     {
-       local ($ltcompile, $ltlink) = &libtool_compiler;
-
        if (! defined $done{'c'})
        {
            &define_configure_variable ($language_map{'c-flags'});

diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 8caef85361fd27152fdec2afa2352a3455422f52..f43f4c6723b4918c4f4bf6d916be88cc429b07ea 100644 (file)
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -15,12 +15,6 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-NOTDEPEND.c.lo:
-## Note that we explicitly set the libtool mode.  This avoids any lossage
-## if the program doesn't have a name that libtool expects.
-## Note also that `-c -o' can always be used with libtool'.
-NOTDEPEND      $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $<
-
 mostlyclean-libtool:
        -rm -f *.lo
 

diff --git a/libtool.am b/libtool.am
index 8caef85361fd27152fdec2afa2352a3455422f52..f43f4c6723b4918c4f4bf6d916be88cc429b07ea 100644 (file)
--- a/libtool.am
+++ b/libtool.am
@@ -15,12 +15,6 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-NOTDEPEND.c.lo:
-## Note that we explicitly set the libtool mode.  This avoids any lossage
-## if the program doesn't have a name that libtool expects.
-## Note also that `-c -o' can always be used with libtool'.
-NOTDEPEND      $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $<
-
 mostlyclean-libtool:
        -rm -f *.lo