[ng] depcomp: prefer make automatic variables over automake transforms

* lib/am/depend2.am: Here, in several recipes.
* t/specflg3.sh: Adjust grepping checks
* t/subobj4.sh: Relax grepping checks.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index e68bba7abcf5f2f1378aeda1c14f9b159a23b8a3..b57f19aaec4e3c7cf4150cdf8d902025c691dabc 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -55,10 +55,10 @@ if !%AMDEP%
        %SILENT%$(am__ensure_target_dir_exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
-       %VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+       %VERBOSE%source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%$<
+?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% $@ %SOURCEFLAG%$<
 ?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%$<
 endif !%FASTDEP%
 
@@ -75,10 +75,10 @@ if !%AMDEP%
        %SILENT%$(am__ensure_target_dir_exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
-       %VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+       %VERBOSE%source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) $<`
+?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% $@ %SOURCEFLAG%`$(CYGPATH_W) $<`
 ?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`$(CYGPATH_W) $<`
 endif !%FASTDEP%
 endif %?NONLIBTOOL%
@@ -97,10 +97,10 @@ if !%AMDEP%
        %SILENT%$(am__ensure_target_dir_exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
-       %VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+       %VERBOSE%source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 ## We can always use '-o' with Libtool.
-       %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%$<
+       %VERBOSE-NODEP%%LTCOMPILE% %-c% -o $@ %SOURCEFLAG%$<
 endif !%FASTDEP%
 endif %?LIBTOOL%

diff --git a/t/specflg3.sh b/t/specflg3.sh
index 9e788726468cdeebc3448f274ae7d27b319cdee4..78cf237b20e0fa298cd50f3dc466278c71366ea8 100755 (executable)
--- a/t/specflg3.sh
+++ b/t/specflg3.sh
@@ -35,7 +35,7 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-$FGREP ' -o foo-foo' Makefile.in
+$FGREP 'foo-foo.$(OBJEXT)' Makefile.in
 $FGREP 'foo.o.o' Makefile.in && Exit 1
 $FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && Exit 1
 $FGREP '$(foo_CFLAGS)' Makefile.in

diff --git a/t/subobj4.sh b/t/subobj4.sh
index 6a3d2212e38a057217bd3c315ea671d2871bc449..6aeb19df6b8c3873446ab639715420bcbc4a8622 100755 (executable)
--- a/t/subobj4.sh
+++ b/t/subobj4.sh
@@ -48,6 +48,5 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^z\.o:.* \.\./d2/z\.c *$' d1/Makefile.in
-grep "@am__fastdepCC_FALSE@.*source=['\"]../d2/z.c['\"] " d1/Makefile.in
 
 :