From: Tom Tromey <tromey@redhat.com>
Date: Fri, 30 Apr 1999 22:18:59 +0000 (+0000)
Subject: 	* automake.in (finish_languages): Always use `-o $@' with
X-Git-Tag: merging-into-user-dep-gen~21
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2258b48340d2de85a68ae54ce1adc5660fe788f6;p=automake.git

	* 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 ead0ac09..f8531389 100644
--- 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 cab64061..1ed48fa9 100644
--- 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 a557ea14..1718c1f0 100755
--- 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 8caef853..f43f4c67 100644
--- 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 8caef853..f43f4c67 100644
--- 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