From d800a25568643fd1c7fb634cc9fbfcbd255d6162 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 1 Nov 2013 14:17:17 +0100
Subject: gbuild: Library: remove gb_Library__get_final_target

... use gb_Library_get_exports_target instead, which is already a
"final" target for Library.

Change-Id: I5b8a708ba97e351ef383dcc64ead4ab9ea8705c7
---
 solenv/gbuild/Library.mk         | 20 ++++++--------------
 solenv/gbuild/TargetLocations.mk |  2 --
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 71ed8b55d5f2..a0c3e703f048 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -35,13 +35,6 @@ gb_Library_LAYER_DIRS := \
 	OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
 	NONE:$(gb_Library_DLLDIR) \
 
-$(dir $(call gb_Library__get_final_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-# doesn't do anything, just used for hooking up component target
-$(call gb_Library__get_final_target,%) :
-	touch $@
-
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/Library/%
 $(WORKDIR)/Clean/Library/% :
@@ -91,8 +84,6 @@ $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS))
 $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
-$(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library__get_final_target,$(1)) :| $(dir $(call gb_Library__get_final_target,$(1))).dir
 $(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1))
 $(call gb_LinkTarget_get_headers_target,$(2)) : \
 	| $(dir $(call gb_Library_get_ilib_target,$(1))).dir
@@ -100,9 +91,9 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Library_Library_platform,$(1),$(2),$(call gb_Library_get_ilib_target,$(1)))
 
-$$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_exports_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
 
-$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library__get_final_target,$(1)))
+$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library_get_exports_target,$(1)))
 
 endef
 
@@ -138,8 +129,9 @@ endef
 
 # The dependency from workdir component target to outdir library should ensure
 # that gb_CppunitTest_use_component can transitively depend on the library.
-# But the component target also must be delivered, so a new phony target
-# gb_Library__get_final_target has been invented for that purpose...
+# But the component target also must be delivered; use the target
+# gb_Library_get_exports_target for that purpose, since it is already
+# the "final" target of the Library...
 define gb_Library_set_componentfile
 $(call gb_Library_get_target,$(gb_Library__get_name)) : \
 	COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(1))),\
@@ -147,7 +139,7 @@ $(call gb_Library_get_target,$(gb_Library__get_name)) : \
 $(call gb_ComponentTarget_ComponentTarget,$(2),\
 	$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
 	$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
-$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
+$(call gb_Library_get_exports_target,$(gb_Library__get_name)) :| \
 	$(call gb_ComponentTarget_get_target,$(2))
 $(call gb_ComponentTarget_get_target,$(2)) :| \
 	$(call gb_Library_get_target,$(gb_Library__get_name))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 635145b82617..58b4f6b3a749 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -207,8 +207,6 @@ define gb_Library_get_versionlink_target
 $(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1)))
 endef
 
-gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
-
 define gb_Library_get_headers_target
 $(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
 endef
-- 
cgit