Skip to content

C
core
Kaydet (Commit) 1715093a authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

More: echo -e is not POSIX (and unknown to Mac OS X) 

Change-Id: I8fdfbebd9fd4bf19b57ec83689116c6fc77227e6
üst 208b3800
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 33 deletions
cppu/CustomTarget_cppu_allheaders.mk
Dosyayı görüntüle @ 1715093a
...@@ -33,17 +33,17 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \ ...@@ -33,17 +33,17 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \
$(cppu_allheaders_DIR)/cppu_allheaders.hxx $(cppu_allheaders_DIR)/cppu_allheaders.hxx
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added # 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) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '// Generated list of all cppu/ includes' > $@ printf '// Generated list of all cppu/ includes\n' > $@
echo -e \ $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \
$(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) \
$(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' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ printf '#include <%s>\n' $(subst $(SRCDIR)/cppu/inc/,,$(file)) >> $@ && \
'#include <$(subst $(SRCDIR)/cppu/inc/,,$(file))>\n' \ $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ ) :
) >> $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
cppuhelper/CustomTarget_cppuhelper_allheaders.mk
Dosyayı görüntüle @ 1715093a
...@@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \ ...@@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added # 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) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '// Generated list of all cppuhelper/ includes' > $@ printf '// Generated list of all cppuhelper/ includes\n' > $@
echo -e \ $(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \
$(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) \
$(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' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ printf '#include <%s>\n' $(subst $(SRCDIR)/cppuhelper/inc/,,$(file)) >> $@ && \
'#include <$(subst $(SRCDIR)/cppuhelper/inc/,,$(file))>\n' \ $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ ) :
) >> $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
salhelper/CustomTarget_salhelper_allheaders.mk
Dosyayı görüntüle @ 1715093a
...@@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ ...@@ -33,17 +33,18 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added # 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) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '// Generated list of all salhelper/ includes' > $@ printf '// Generated list of all salhelper/ includes\n' > $@
echo -e \ $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \
$(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) \
$(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' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \ printf '#include <%s>\n' $(subst $(SRCDIR)/salhelper/inc/,,$(file)) >> $@ && \
'#include <$(subst $(SRCDIR)/salhelper/inc/,,$(file))>\n' \ $(if $(findstring /win32/, $(file)), printf '#endif // _WIN32\n' >> $@ &&) \
$(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \ ) :
) >> $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment