* 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?.

diff --git a/ChangeLog b/ChangeLog
index e5b9045966bab6df40061eb95c40edc09a087bce..9e9b1439a819de309d9d3c42860a61adfaa25b62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-28  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?.
+
 2001-02-28  Akim Demaille  <akim@epita.fr>
 
        * Makefile.am (maintainer-check): `undef $/' is OK.

diff --git a/automake.in b/automake.in
index d7d7c4837fa264037d867282cfa304831f5dd956..6db3dbff9dbb59774f9820f77bfd0889789847cd 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -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))
     }
 }
 

diff --git a/depend2.am b/depend2.am
index 06b36ad1218125e3d8652aafc32497d6fc3acf28..77241576bfbf3830f11ee9de2d8967c409769d63 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -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@

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 06b36ad1218125e3d8652aafc32497d6fc3acf28..77241576bfbf3830f11ee9de2d8967c409769d63 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -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@