diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | automake.in | 5 | ||||
| -rw-r--r-- | compile.am | 6 | ||||
| -rw-r--r-- | lib/am/compile.am | 6 |
5 files changed, 16 insertions, 7 deletions
@@ -1,5 +1,10 @@ 1999-04-11 Tom Tromey <tromey@cygnus.com> + * automake.in (get_object_extension): Substitute @MINUSO@ when + including compile.am. + * compile.am (.c.o): Added @MINUSO@. + (.c.obj): Likewise. + First cut at allowing objects in subdirectories: * m4/Makefile.am (m4data_DATA): Added minuso.m4. * Makefile.am (dist_script_DATA): Added compile. @@ -4,6 +4,7 @@ if there are two `bar.o' files and the timing is just right This only happens with parallel make and no-`-c -o' compiler, so it probably isn't very important + change compile.am and lang_c_finish to deal with -c -o. * Run automake before libtool. It will report an error but still won't put the file into the disty. This is wrong. diff --git a/automake.in b/automake.in index 83661c157..d0b50e8a1 100755 --- a/automake.in +++ b/automake.in @@ -815,7 +815,10 @@ sub get_object_extension $xform = (($use_dependencies ? 's/^NOTDEPEND.*$//;' : 's/^NOTDEPEND//;') - . ($seen_objext ? 's/^OBJEXT//;' : 's/^OBJEXT.*$//;')); + . ($seen_objext ? 's/^OBJEXT//;' : 's/^OBJEXT.*$//;') + . 's/\@MINUSO\@/' + . (defined $options{'subdir-objects'} ? '-o \$\@' : '') + . '/;'); $output_rules .= &file_contents_with_transform ($xform, 'compile'); &push_phony_cleaners ('compile'); diff --git a/compile.am b/compile.am index 6e9f92a21..8c755f78b 100644 --- a/compile.am +++ b/compile.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,12 +16,12 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. NOTDEPEND.c.o: -NOTDEPEND $(COMPILE) -c $< +NOTDEPEND $(COMPILE) -c@MINUSO@ $< OBJEXT# FIXME: We should only use cygpath when building on Windows, OBJEXT# and only if it is available. OBJEXT.c.obj: -OBJEXT $(COMPILE) -c `cygpath -w $<` +OBJEXT $(COMPILE) -c@MINUSO@ `cygpath -w $<` .s.o: $(COMPILE) -c $< diff --git a/lib/am/compile.am b/lib/am/compile.am index 6e9f92a21..8c755f78b 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,12 +16,12 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. NOTDEPEND.c.o: -NOTDEPEND $(COMPILE) -c $< +NOTDEPEND $(COMPILE) -c@MINUSO@ $< OBJEXT# FIXME: We should only use cygpath when building on Windows, OBJEXT# and only if it is available. OBJEXT.c.obj: -OBJEXT $(COMPILE) -c `cygpath -w $<` +OBJEXT $(COMPILE) -c@MINUSO@ `cygpath -w $<` .s.o: $(COMPILE) -c $< |