[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/11] depend: prefer $(...) over `...` in Cygwin-specific recipe
From: |
Stefano Lattarini |
Subject: |
[PATCH 10/11] depend: prefer $(...) over `...` in Cygwin-specific recipes |
Date: |
Sat, 12 Jan 2013 13:52:03 +0100 |
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 <address@hidden>
---
lib/am/depend2.am | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 5522aa3..a947ee7 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%
--
1.8.1.rc3.192.g2d0029e
- [PATCH 00/11] Make 'subdir-objects' mandatory, and related cleanups, Stefano Lattarini, 2013/01/12
- [PATCH 05/11] depend: assume '-c' compiler flag always means to produce object files, Stefano Lattarini, 2013/01/12
- [PATCH 01/11] compile: avoid AC_PROG_CC messy rewrite, Stefano Lattarini, 2013/01/12
- [PATCH 04/11] depend: assume we can always pass "-o" to the C compiler, Stefano Lattarini, 2013/01/12
- [PATCH 03/11] cleanup: having subdir-objects mandatory allow us some simplifications, Stefano Lattarini, 2013/01/12
- [PATCH 06/11] Automake::Language: drop unused fields 'compile_flag' and 'output_flag', Stefano Lattarini, 2013/01/12
- [PATCH 02/11] subdir-objects: enable unconditionally, Stefano Lattarini, 2013/01/12
- [PATCH 09/11] depend2.am: reduce code duplication, Stefano Lattarini, 2013/01/12
- [PATCH 10/11] depend: prefer $(...) over `...` in Cygwin-specific recipes,
Stefano Lattarini <=
- [PATCH 07/11] depend2.am: refactor and remove code duplication, Stefano Lattarini, 2013/01/12
- [PATCH 11/11] depend: reduce code duplication, de-uglify make verbose output, Stefano Lattarini, 2013/01/12
- [PATCH 08/11] depend2.am: preparatory refactoring, Stefano Lattarini, 2013/01/12