diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-11 20:44:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-12 00:20:10 +0100 |
| commit | 2c258d0689195af1533f0e08a6c4463986dc8b77 (patch) | |
| tree | 5f9f313229602bec1d74a7f49ee15b77fc768c3d /sysui | |
| parent | 81f416ba1b10788f37fd6391c6e7b787347d28fe (diff) | |
sysui: fix incremental builds in CustomTarget_share
The libreoffice/*.desktop need to have a target and rule to propagate
out-of-date-ness.
Change-Id: If341cc67ed6e24ceee7c00efba2750864aad4a70
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/CustomTarget_share.mk | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 79eea3a3a67c..7851156b4dbe 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -124,16 +124,16 @@ $(eval $(call gb_CustomTarget_CustomTarget,sysui/share)) $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ $(ULFS) \ $(foreach product,$(PRODUCTLIST),\ - $(product)/build.flag \ - $(product)/openoffice.org.xml \ - $(product)/openoffice.mime \ - $(product)/openoffice.applications \ - $(product)/openoffice.keys \ - $(product)/openoffice.sh \ - $(product)/printeradmin.sh \ - $(product)/create_tree.sh \ - $(product)/mimelnklist \ - $(product)/launcherlist) \ + $(product)/build.flag \ + $(product)/openoffice.org.xml \ + $(product)/openoffice.mime \ + $(product)/openoffice.applications \ + $(product)/openoffice.keys \ + $(product)/openoffice.sh \ + $(product)/printeradmin.sh \ + $(product)/create_tree.sh \ + $(product)/mimelnklist \ + $(product)/launcherlist) \ )) $(share_WORKDIR)/%/openoffice.org.xml: $(share_WORKDIR)/documents.ulf $(MIMEDESKTOPS) $(share_SRCDIR)/share/create_mime_xml.pl @@ -203,8 +203,18 @@ $(share_WORKDIR)/%/openoffice.applications: $(share_SRCDIR)/mimetypes/openoffice $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$*)/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION.$*)/" > $@ +# these .desktop files are written by brand.pl below +# need to have a rule for these because they are targets in Package_share +define sysui_Desktop_rule +$(share_WORKDIR)/%/$(1).desktop : $(share_WORKDIR)/%/build.flag + touch $$@ + +endef + +$(foreach launcher,$(LAUNCHERLIST),$(eval $(call sysui_Desktop_rule,$(launcher)))) + $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ - $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS)) + $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS)) mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(PERL) $(share_SRCDIR)/share/brand.pl -p '$${PRODUCTNAME} $${PRODUCTVERSION}' -u $(UNIXFILENAME.$*) \ |