diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-16 14:54:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-16 16:54:59 +0200 |
| commit | 85c7e212a26b24883b9a001b6529efeb80955809 (patch) | |
| tree | 61e29807b75c37191d8ac53055ec4d62507bd0c2 /sysui | |
| parent | 2bbf5d5bcffd2218f6b48fdfa4965735cbd4dd68 (diff) | |
gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/CustomTarget_infoplist.mk | 9 | ||||
| -rw-r--r-- | sysui/CustomTarget_share.mk | 17 | ||||
| -rw-r--r-- | sysui/Module_sysui.mk | 2 |
3 files changed, 13 insertions, 15 deletions
diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk index 64419ba5526a..48e8cc84fefb 100644 --- a/sysui/CustomTarget_infoplist.mk +++ b/sysui/CustomTarget_infoplist.mk @@ -31,10 +31,17 @@ $(info_WORKDIR)/InfoPlist_%.zip: $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1) zip -j $@ $< -$(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: $(info_WORKDIR)/Info.plist $(call gb_CustomTarget_get_workdir,sysui/share)/documents.ulf +$(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: \ + $(info_WORKDIR)/Info.plist $(info_WORKDIR)/documents.ulf mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(PERL) -w $(info_SRCDIR)/gen_strings.pl -l $* -p $^ | \ iconv -f UTF-8 -t UTF-16 >$@ +$(eval $(call gb_CustomTarget_ulfex_rule,\ + $(info_WORKDIR)/documents.ulf,\ + $(SRCDIR)/sysui/desktop/share/documents.ulf,\ + $(foreach lang,$(gb_TRANS_LANGS),\ + $(gb_POLOCATION)/$(lang)/sysui/desktop/share.po))) + # vim: set noet sw=4 ts=4: diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index e342cfa2afe4..278399519e6c 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -212,17 +212,10 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ --ext "desktop" --key "UnityQuickList" $(share_WORKDIR)/launcher_unityquicklist.ulf touch $@ -ifneq ($(WITH_LANG),) -$(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf | $(call gb_Executable_get_runtime_dependencies,ulfex) - $(call gb_Output_announce,$@,$(true),SUM,1) - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/sysui/desktop/share.po) > $${MERGEINPUT} && \ - $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ - rm -rf $${MERGEINPUT} -else -$(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf - cp $< $@ -endif +$(eval $(call gb_CustomTarget_ulfex_rule,\ + $(share_WORKDIR)/%.ulf,\ + $(share_SRCDIR)/share/%.ulf,\ + $(foreach lang,$(gb_TRANS_LANGS),\ + $(gb_POLOCATION)/$(lang)/sysui/desktop/share.po))) # vim: set noet sw=4 ts=4: diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk index 56bd5236ffa6..62fb208a58e5 100644 --- a/sysui/Module_sysui.mk +++ b/sysui/Module_sysui.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Module_add_targets,sysui,\ )) else # OS=MACOSX -# CustomTarget_share builds documents.ulf which is needed in infoplist... $(eval $(call gb_Module_add_targets,sysui,\ - CustomTarget_share \ Package_osxicons \ CustomTarget_infoplist \ Package_infoplist \ |