This is the mail archive of the
automake@gnu.org
mailing list for the automake project.
82-depend2-fix-non-generic.patch
- To: automake at gnu dot org
- Subject: 82-depend2-fix-non-generic.patch
- From: Akim Demaille <akim at epita dot fr>
- Date: 28 Feb 2001 10:59:05 +0100
- List-Id: Discussion list for automake <automake.gnu.org>
I'm applying it since it's a bug fix, and rather obvious.
Index: ChangeLog
from Akim Demaille <akim@epita.fr>
* automake.in (&add_depend2): Transform `GENERIC'.
Get rid of the ad hoc transformation of `@EXT@.o:' which in
addition was broken by the `@ -> %' patch.
* depend2.am: Adjust to use ?GENERIC?.
Index: automake.in
--- automake.in Tue, 27 Feb 2001 22:20:29 +0100 akim (am/f/39_automake.i 1.89 755)
+++ automake.in Tue, 27 Feb 2001 22:22:41 +0100 akim (am/f/39_automake.i 1.89 755)
@@ -2750,7 +2750,8 @@ sub add_depend2
my $compile = '$(' . $pfx . 'COMPILE)';
my $ltcompile = '$(LT' . $pfx . 'COMPILE)';
my $xform1 = ($xform
- . &transform ('BASE' => '$*',
+ . &transform ('GENERIC' => 1,
+ 'BASE' => '$*',
'SOURCE' => '$<',
'OBJ' => '$@',
'LTOBJ' => '$@',
@@ -2799,22 +2800,14 @@ sub add_depend2
&file_contents
('depend2',
$xform
- . &transform ('COMPILE' => $obj_compile,
- 'LTCOMPILE' => $obj_ltcompile,
- # Handle source and obj transforms.
- 'OBJ' => $obj . '.o',
- 'OBJOBJ' => $obj . '.obj',
- 'LTOBJ' => $obj . '.lo',
+ . &transform ('GENERIC' => 0,
'BASE' => $obj,
- 'SOURCE' => $source)
- # Generate rule for `.o'.
- . 's/^\@EXT\@\.o:/' . "\Q$obj.o: $source\E" . '/g;'
- # Maybe generate rule for `.lo'. Might be eliminated
- # by $XFORM.
- . 's/^\@EXT\@\.lo:/' . "\Q$obj.lo: $source\E" . '/g;'
- # Maybe generate rule for `.obj'. Might be
- # eliminated by $XFORM.
- . 's/^\@EXT\@\.obj:/' . "\Q$obj.obj: $source\E" . '/g;');
+ 'SOURCE' => $source,
+ 'OBJ' => "$obj.o",
+ 'OBJOBJ' => "$obj.obj",
+ 'LTOBJ' => "$obj.lo",
+ 'COMPILE' => $obj_compile,
+ 'LTCOMPILE' => $obj_ltcompile))
}
}
Index: depend2.am
--- depend2.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/43_depend2.am 1.6 644)
+++ depend2.am Tue, 27 Feb 2001 22:22:31 +0100 akim (am/g/43_depend2.am 1.6 644)
@@ -23,19 +23,22 @@
?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@
-%EXT%.o:
+?GENERIC?%EXT%.o:
+?!GENERIC?%OBJ%: %SOURCE%
?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
%COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
-?LIBTOOL?%EXT%.lo:
+?GENERIC??LIBTOOL?%EXT%.lo:
+?!GENERIC??LIBTOOL?LTOBJ%: %SOURCE%
?LIBTOOL??AMDEP?@AMDEP@ source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
?LIBTOOL??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
?LIBTOOL??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
?LIBTOOL? %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
-?OBJEXT?%EXT%.obj:
+?GENERIC??OBJEXT?%EXT%.obj:
+?!GENERIC??OBJEXT?%OBJOBJ%: %SOURCE%
?OBJEXT??AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
?OBJEXT??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
?OBJEXT??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@