[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 1/3] [ng] depcomp: prefer make automatic variables
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 1/3] [ng] depcomp: prefer make automatic variables over automake transforms |
Date: |
Fri, 8 Jun 2012 12:49:11 +0200 |
* 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 <address@hidden>
---
lib/am/depend2.am | 12 ++++++------
t/specflg3.sh | 2 +-
t/subobj4.sh | 1 -
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index e68bba7..b57f19a 100644
--- 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 9e78872..78cf237 100755
--- 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 6a3d221..6aeb19d 100755
--- a/t/subobj4.sh
+++ b/t/subobj4.sh
@@ -48,6 +48,5 @@ $ACLOCAL
$AUTOMAKE
grep '^z\.o:.* \.\./d2/z\.c *$' d1/Makefile.in
-grep "@address@hidden'\"]../d2/z.c['\"] " d1/Makefile.in
:
--
1.7.9.5