diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-23 15:24:56 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-25 02:08:58 +0000 |
| commit | daf9156c76049873583f1f7c5de96524d7eba68a (patch) | |
| tree | 7fd415f7fae12c58697a0c7db8fabb7838397e9d /solenv | |
| parent | 65541cfaa167c9ac80af770c6034badefdc34199 (diff) | |
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@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index af57a716fbd6..392ff1e99a0c 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) |