mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use gb_Helper_make_url here

Browse Source
This commit is contained in:
Matúš Kukan
2012-04-09 19:50:58 +02:00
parent badfd77af8
commit f98ffc5be6
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
i18npool/CustomTarget_localedata.mk
View File

@@ -34,17 +34,13 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(patsubst %.xml,$(IPLD)/localedata_%.cxx, \ $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
# TODO: move this to gbuild/
my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/)
my_components := component/sax/source/expatwrap/expwrap.component
$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \
$(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) $(OUTDIR_FOR_BUILD)/bin/types.rdb \
-env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
rm $@.tmp) rm $@.tmp)
@@ -58,6 +54,6 @@ $(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \
$(IPLD)/saxparser.input :| $(IPLD)/.dir $(IPLD)/saxparser.input :| $(IPLD)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '<list><filename>$(my_components)</filename></list>' > $@ echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: