summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-16 20:46:14 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-16 20:46:14 +0200
commit1715093a08a6d7a0196ad9acb42775b88b5ebe4b (patch)
tree3346db577662f6a3786b82413061b98b767af7bb /cppuhelper
parent208b380090d98c56947ad15a0ee9e3d0d5ea2151 (diff)
More: echo -e is not POSIX (and unknown to Mac OS X)
Change-Id: I8fdfbebd9fd4bf19b57ec83689116c6fc77227e6
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/CustomTarget_cppuhelper_allheaders.mk23
1 files changed, 12 insertions, 11 deletions
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: