From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 10 Jan 2013 20:42:28 +0000 (+0100)
Subject: depend: prefer $(...) over `...` in Cygwin-specific recipes
X-Git-Tag: v1.16~89^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436cb17eabc2758faec17e2922547a5794a45f57;p=thirdparty%2Fautomake.git

depend: prefer $(...) over `...` in Cygwin-specific recipes

On Cygwin, we can happily assume only POSIX-conforming shells exist.
This commit is useless by itself, but is useful as a preparatory
refactoring in view of a future change.

* lib/am/depend2.am: In recipes for producing '.obj' objects, use
the POSIX form $(...) for command substitution, rather than the
classic Bourne one `...`.

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

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 5522aa36a..a947ee7b6 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -63,10 +63,10 @@ endif !%FASTDEP%
 if %FASTDEP%
 	%VERBOSE%$(am__set_depbase) \
 	&& %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
-?GENERIC?	`$(CYGPATH_W) '%SOURCE%'` \
+?GENERIC?	$$($(CYGPATH_W) '%SOURCE%') \
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC?	 else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
+?!GENERIC?	$$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC?	   else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi) \
 	&& $(am__mv) $$depbase.Tpo $$depbase.Po
 else !%FASTDEP%
 if %AMDEP%
@@ -74,10 +74,10 @@ if %AMDEP%
 	DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 	%VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
-?GENERIC?	`$(CYGPATH_W) '%SOURCE%'`
+?GENERIC?	$$($(CYGPATH_W) '%SOURCE%')
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC?	 else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!GENERIC?	$$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC?	   else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi)
 endif !%FASTDEP%
 endif %?NONLIBTOOL%