[Libreoffice-commits] .: sal/CustomTarget_sal_allheaders.mk

[Stephan Bergmann]

 sal/CustomTarget_sal_allheaders.mk |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 208b380090d98c56947ad15a0ee9e3d0d5ea2151
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 16 20:20:37 2012 +0200

    echo -e is not POSIX (and unknown to Mac OS X)
    
    Change-Id: Id55d2028e44bfea57cd8d6c0d7085f5f6f2c77ed

diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index b008a3c..d59fb05 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -33,20 +33,20 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \
 	$(sal_allheaders_DIR)/sal_allheaders.hxx
 
 # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(sal_allheaders_DIR)/sal_allheaders.hxx :| $(sal_allheaders_DIR)/.dir $(SRCDIR)/sal/Package_inc.mk
+$(sal_allheaders_DIR)/sal_allheaders.hxx : CustomTarget_sal_allheaders.mk \
+            | $(sal_allheaders_DIR)/.dir $(SRCDIR)/sal/Package_inc.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	echo '// Generated list of all sal/ includes' >  $@
-	echo '#ifdef WNT' >>  $@
-	echo '#include <windows.h>' >>  $@
-	echo '#endif' >>  $@
-	echo -e  \
-	    $(foreach file, $(wildcard $(SRCDIR)/sal/inc/*.h) $(wildcard $(SRCDIR)/sal/inc/*.hxx) \
-	                    $(wildcard $(SRCDIR)/sal/inc/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*.hxx) \
-	                    $(wildcard $(SRCDIR)/sal/inc/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*.hxx) \
-	                    $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.hxx), \
-	        $(if $(findstring /win32/, $(file)), '#ifdef WNT\n') \
-	        '#include <$(subst $(SRCDIR)/sal/inc/,,$(file))>\n' \
-	        $(if $(findstring /win32/, $(file)), '#endif // WNT\n') \
-	    ) >> $@
+	printf '// Generated list of all sal/ includes\n' >  $@
+	printf '#ifdef WNT\n' >>  $@
+	printf '#include <windows.h>\n' >>  $@
+	printf '#endif\n' >>  $@
+	$(foreach file, $(wildcard $(SRCDIR)/sal/inc/*.h) $(wildcard $(SRCDIR)/sal/inc/*.hxx) \
+	                $(wildcard $(SRCDIR)/sal/inc/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*.hxx) \
+	                $(wildcard $(SRCDIR)/sal/inc/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*.hxx) \
+	                $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.hxx), \
+	    $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \
+	    printf '#include <%s>\n' $(subst $(SRCDIR)/sal/inc/,,$(file)) >> $@ && \
+	    $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
+	    ) :
 
 # vim: set noet sw=4 ts=4: