summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-15 21:52:01 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-01-25 17:17:04 +0000
commit71e7c205d6219085bd856098228adbc73868dfd5 (patch)
treeca1304aa8d0fb6dc0e80e953f03a17307b6c3416 /solenv
parenteb1afda651bc9077efc1020825545a90752a0177 (diff)
gbuild: missing dependency in CustomTarget
Change-Id: I560384d91fa5c6ba42123330369628419fe1bc1c (cherry picked from commit 25aea9b1ec325d060f0d29cddfc3762ca175e511) Reviewed-on: https://gerrit.libreoffice.org/21781 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/CustomTarget.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 8f5ef05d4089..28ffc16af22f 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -93,14 +93,15 @@ $(call gb_CustomTarget_get_workdir,$(1))/misc/$(5)ids.inc \
$(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \
$(if $(6),$(call gb_CustomTarget_get_workdir,$(1))/misc/$(6)) \
$(if $(7),$(call gb_CustomTarget_get_workdir,$(1))/$(7)names.inc) : \
- $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx
+ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx
touch $$@
$(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \
- $(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.pl) \
- $(SRCDIR)/$(3)/$(4).txt \
- $(SRCDIR)/$(3)/$(4).hxx.head \
- $(SRCDIR)/$(3)/$(4).hxx.tail
+ $(if $(7),$(SRCDIR)/$(3)/$(7).txt) \
+ $(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.pl) \
+ $(SRCDIR)/$(3)/$(4).txt \
+ $(SRCDIR)/$(3)/$(4).hxx.head \
+ $(SRCDIR)/$(3)/$(4).hxx.tail
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
mkdir -p $(call gb_CustomTarget_get_workdir,$(1))/misc \
$(call gb_CustomTarget_get_workdir,$(1)) \