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

let's split this for easier cherry-picking

Browse Source 
This reverts commit fc65a66de9.
This commit is contained in:
David Tardon
2013-02-13 10:58:32 +01:00
parent fc65a66de9
commit 7c8d4cfb2b
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crashrep/CustomTarget_crashrep_res.mk
View File

@@ -10,15 +10,14 @@
$(eval $(call gb_CustomTarget_CustomTarget,crashrep/source/win32))
$(eval $(call gb_CustomTarget_register_targets,crashrep/source/win32, \
crashrep.ulf \
crashrep_impl.rc \
))
$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \
$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf \
$(SRCDIR)/crashrep/source/win32/rcfooter.txt \
$(SRCDIR)/crashrep/source/win32/rcheader.txt \
$(SRCDIR)/crashrep/source/win32/rctemplate.txt \
$(SRCDIR)/crashrep/source/win32/crashrep.ulf \
$(call gb_Executable_get_runtime_dependencies,lngconvex)
#BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)
@@ -27,18 +26,10 @@ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc :
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/crashrep/source/win32 && \
$(call gb_Executable_get_command,lngconvex) \
-ulf $< \
-ulf crashrep.ulf \
-rc $@ \
-rct rctemplate.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \
$(SRCDIR)/crashrep/source/win32/crashrep.ulf \
$(call gb_Executable_get_runtime_dependencies,ulfex)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,ulfex) -p crashrep -i $< -o $@ -m $${MERGEINPUT} -l all && \
rm -f $${MERGEINPUT}
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

17
shell/CustomTarget_shlxthdl_res.mk
View File

@@ -27,19 +27,14 @@
$(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/shlxthandler/res))
$(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/res,\
shlxthdl.ulf \
shlxthdl_impl.rc \
))
$(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
$(call gb_Executable_get_runtime_dependencies,lngconvex) \
| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
@@ -49,18 +44,10 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_command,lngconvex) \
-ulf $< \
-ulf shlxthdl.ulf \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : \
$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
$(call gb_Executable_get_runtime_dependencies,ulfex)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
$(call gb_Executable_get_command,ulfex) -p shell -i $< -o $@ -m $${MERGEINPUT} -l all && \
rm -f $${MERGEINPUT}
# vim: set shiftwidth=4 tabstop=4 noexpandtab: