summaryrefslogtreecommitdiff
path: root/cppu
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 /cppu
parent208b380090d98c56947ad15a0ee9e3d0d5ea2151 (diff)
More: echo -e is not POSIX (and unknown to Mac OS X)
Change-Id: I8fdfbebd9fd4bf19b57ec83689116c6fc77227e6
Diffstat (limited to 'cppu')
-rw-r--r--cppu/CustomTarget_cppu_allheaders.mk22
1 files changed, 11 insertions, 11 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: