diff options
| author | David Tardon <dtardon@redhat.com> | 2013-03-03 09:15:59 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-03 09:28:31 +0100 |
| commit | d5622fa168d4b97096ec19abaa34dc7befaa89ae (patch) | |
| tree | 5b12ac92d1d6320ffaa59c699c858ecb3f46bcd8 | |
| parent | 3c82b95d92151be365f673c04c78ad1368b928d9 (diff) | |
make sure .ui files are packed too
Change-Id: If79dcfded502990e5c452a86ed17bd796de7f30b
| -rw-r--r-- | postprocess/CustomTarget_config.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Postprocess.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/UI.mk | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk index ca64a5ed74f1..80a415849e1a 100644 --- a/postprocess/CustomTarget_config.mk +++ b/postprocess/CustomTarget_config.mk @@ -21,7 +21,9 @@ $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \ @true $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \ - $(SRCDIR)/postprocess/packconfig/packconfig.pl $(call gb_Postprocess_get_target,AllPackages) + $(SRCDIR)/postprocess/packconfig/packconfig.pl \ + $(call gb_Postprocess_get_target,AllPackages) \ + $(call gb_Postprocess_get_target,AllUIs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) cd $(SRCDIR)/postprocess/packconfig \ && $(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@) diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 6dd16a99a2cb..e0c448db01a9 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -28,6 +28,7 @@ $(call gb_Postprocess_Postprocess,AllLibraries,All libraries) $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but instset,$(WORKDIR)/Module/) $(call gb_Postprocess_Postprocess,AllPackages,All packages) $(call gb_Postprocess_Postprocess,AllResources,All resources) +$(call gb_Postprocess_Postprocess,AllUIs,All UI files) endef diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk index 2bd07acf74aa..1cbb86613f94 100644 --- a/solenv/gbuild/UI.mk +++ b/solenv/gbuild/UI.mk @@ -111,6 +111,7 @@ define gb_UI_UI $(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR)) $(call gb_UI_get_target,$(1)) :| $(dir $(call gb_UI_get_target,$(1))).dir $(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui) +$(call gb_Postprocess_get_target,AllUIs) : $(call gb_UI_get_target,$(1)) $(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui) ifneq ($(gb_UI_LANGS),) |