solenv/gbuild/CustomTarget.mk | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 71e7c205d6219085bd856098228adbc73868dfd5
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jan 15 21:52:01 2016 +0100
gbuild: missing dependency in CustomTarget
Change-Id: I560384d91fa5c6ba42123330369628419fe1bc1c
(cherry picked from commit 25aea9b1ec325d060f0d29cddfc3762ca175e511)
Reviewed-on: https://gerrit.libreoffice.org/21781
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 8f5ef05..28ffc16 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)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
