[Libreoffice-commits] core.git: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_GbuildToJson.mk |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit daf9156c76049873583f1f7c5de96524d7eba68a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 23 15:24:56 2016 +0100

    rename foo target to something more meaningful
    
    - also use gb_Helper_MISCDUMMY were possible (this might fix the
      'circular deps' warnings
    
    Change-Id: I419f39973b5c785c1d8ccba9f8ed75a77f08ffa2
    Reviewed-on: https://gerrit.libreoffice.org/31117
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index af57a71..392ff1e 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -17,8 +17,9 @@ gbuildtojson:
 	@true
 
 
-.PHONY : foo
-foo:
+gb_GbuildToJson_PHONY := $(WORKDIR)/GBUILDTOJSONPHONY
+.PHONY : $(gb_GbuildToJson_PHONY)
+$(gb_GbuildToJson_PHONY):
 	@true
 
 
@@ -56,13 +57,13 @@ endef
 define gb_Postprocess_register_target
 gbuildtojson : $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3)))
 
-$(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) foo
+$(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_PHONY)
 $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): T_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 endef
 
 gb_LinkTarget_use_static_libraries =
-gb_UnoApiHeadersTarget_get_target = foo
-gb_UnpackedTarball_get_final_target = foo
+gb_UnoApiHeadersTarget_get_target = $(gb_Helper_MISCDUMMY)
+gb_UnpackedTarball_get_final_target = $(gb_Helper_MISCDUMMY)
 gb_LinkTarget__get_headers_check =
 gb_LinkTarget_add_cobject = $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
 gb_LinkTarget_add_cxxobject = $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)