Only process with brand.pl the *.keys and *.desktop files
...and not also whatever other prerequisites those two rules might have (e.g.,
instdir/program/python.bin).
Before 01344a8ca57636ac87108c22f777a02fe6d963d5 "convert sysui to gbuild and add
to tail_build", the corresponding dmake code in sysui/desktop/share/makefile.mk
had been
> $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/openoffice.mime brand.pl translate.pl ../productversion.mk $(ULFDIR)$/documents.ulf
> $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.keys
[...]
> @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(MISC)/$(@:d:d:f)
[...]
and
> $(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
> $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
[...]
> @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
[...]
where Dmake's $< denotes "the list of prerequisites specified in the current
rule" (<https://www.openoffice.org/tools/dmake/dmake_4.11.html>, section
"RUNTIME MACROS"), whereas GNU Make's $^ denotes all prerequisites.
Change-Id: Ie6efc5d9512408711db32502e0959b32ec232603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91566
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 7402ddd..f4c38f8 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -139,7 +139,6 @@
$(PERL) $(share_SRCDIR)/share/create_mime_xml.pl $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
$(share_WORKDIR)/%/openoffice.keys: \
$(share_SRCDIR)/mimetypes/openoffice.mime $(MIMEKEYS) $(share_SRCDIR)/share/brand.pl \
$(share_TRANSLATE) $(share_WORKDIR)/documents.ulf \
@@ -148,7 +147,7 @@
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
--iconprefix $(UNIXFILENAME.$*)- $^ $(share_WORKDIR)/$*
--iconprefix $(UNIXFILENAME.$*)- $(MIMEKEYS) $(share_WORKDIR)/$*
$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) \
-p $* -d $(share_WORKDIR)/$* \
--ext "keys" --key "description" $(share_WORKDIR)/documents.ulf
@@ -244,7 +243,7 @@
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(PERL) $(share_SRCDIR)/share/brand.pl -p '$${PRODUCTNAME} $${PRODUCTVERSION}' -u $(UNIXFILENAME.$*) \
$(brand_URIPARAM) \
--iconprefix '$${UNIXBASISROOTNAME}-' $^ $(share_WORKDIR)/$*
--iconprefix '$${UNIXBASISROOTNAME}-' $(LAUNCHERS) $(share_WORKDIR)/$*
$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
--ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf
$(call gb_ExternalExecutable_get_command,python) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
