From 1715093a08a6d7a0196ad9acb42775b88b5ebe4b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 16 Jul 2012 20:46:14 +0200 Subject: More: echo -e is not POSIX (and unknown to Mac OS X) Change-Id: I8fdfbebd9fd4bf19b57ec83689116c6fc77227e6 --- cppu/CustomTarget_cppu_allheaders.mk | 22 +++++++++++----------- cppuhelper/CustomTarget_cppuhelper_allheaders.mk | 23 ++++++++++++----------- salhelper/CustomTarget_salhelper_allheaders.mk | 23 ++++++++++++----------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk index 9097ae465175..66ac061f53c3 100644 --- a/cppu/CustomTarget_cppu_allheaders.mk +++ b/cppu/CustomTarget_cppu_allheaders.mk @@ -33,17 +33,17 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \ $(cppu_allheaders_DIR)/cppu_allheaders.hxx # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added -$(cppu_allheaders_DIR)/cppu_allheaders.hxx :| $(cppu_allheaders_DIR)/.dir $(SRCDIR)/cppu/Package_inc.mk +$(cppu_allheaders_DIR)/cppu_allheaders.hxx : CustomTarget_cppu_allheaders.mk \ + | $(cppu_allheaders_DIR)/.dir $(SRCDIR)/cppu/Package_inc.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '// Generated list of all cppu/ includes' > $@ - echo -e \ - $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \ - $(wildcard $(SRCDIR)/cppu/inc/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*.hxx) \ - $(wildcard $(SRCDIR)/cppu/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*.hxx) \ - $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.hxx), \ - $(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ - '#include <$(subst $(SRCDIR)/cppu/inc/,,$(file))>\n' \ - $(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ - ) >> $@ + printf '// Generated list of all cppu/ includes\n' > $@ + $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \ + $(wildcard $(SRCDIR)/cppu/inc/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*.hxx) \ + $(wildcard $(SRCDIR)/cppu/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*.hxx) \ + $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.hxx), \ + $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \ + printf '#include <%s>\n' $(subst $(SRCDIR)/cppu/inc/,,$(file)) >> $@ && \ + $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \ + ) : # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk index 24d80c3650ff..8438a1dd88d9 100644 --- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk +++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk @@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \ $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added -$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx :| $(cppuhelper_allheaders_DIR)/.dir $(SRCDIR)/cppuhelper/Package_inc.mk +$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \ + CustomTarget_cppuhelper_allheaders.mk \ + | $(cppuhelper_allheaders_DIR)/.dir $(SRCDIR)/cppuhelper/Package_inc.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '// Generated list of all cppuhelper/ includes' > $@ - echo -e \ - $(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \ - $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.hxx) \ - $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.hxx) \ - $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.hxx), \ - $(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ - '#include <$(subst $(SRCDIR)/cppuhelper/inc/,,$(file))>\n' \ - $(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ - ) >> $@ + printf '// Generated list of all cppuhelper/ includes\n' > $@ + $(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \ + $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.hxx) \ + $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.hxx) \ + $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.hxx), \ + $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \ + printf '#include <%s>\n' $(subst $(SRCDIR)/cppuhelper/inc/,,$(file)) >> $@ && \ + $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \ + ) : # vim: set noet sw=4 ts=4: diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk index f760426ccde7..bc11fca9b5da 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added -$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx :| $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk +$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ + CustomTarget_salhelper_allheaders.mk \ + | $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '// Generated list of all salhelper/ includes' > $@ - echo -e \ - $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.hxx), \ - $(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ - '#include <$(subst $(SRCDIR)/salhelper/inc/,,$(file))>\n' \ - $(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ - ) >> $@ + printf '// Generated list of all salhelper/ includes\n' > $@ + $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \ + $(wildcard $(SRCDIR)/salhelper/inc/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*.hxx) \ + $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.hxx) \ + $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.hxx), \ + $(if $(findstring /win32/, $(file)), printf '#ifdef _WIN32\n' >> $@ &&) \ + printf '#include <%s>\n' $(subst $(SRCDIR)/salhelper/inc/,,$(file)) >> $@ && \ + $(if $(findstring /win32/, $(file)), printf '#endif // _WIN32\n' >> $@ &&) \ + ) : # vim: set noet sw=4 ts=4: -- cgit