gbuild: gb_Library_TARGETS should really not be needed now

Change-Id: I1a5f2fda44da782b43076eee67e292affe1bad1a

6 files changed, 7 insertions, 18 deletions

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c210cd716a61..9817ef2923eb 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -108,12 +108,6 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=))
 
 endef
 
-define gb_Helper_collect_libtargets
-gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
-gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
-
-endef
-
 define gb_Helper_collect_knownlibs
 gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
 gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 518211152cda..d07fe24292e0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -37,7 +37,6 @@
 #  gb_Library_DLLFILENAMES
 #  gb_Library_FILENAMES
 #  gb_Library_Library_platform
-#  gb_Library_TARGETS
 
 # doesn't do anything, just used for hooking up component target
 .PHONY: $(call gb_Library__get_final_target,%)
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 124b009213b4..a09f720db995 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -33,7 +33,6 @@
 #  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
 # defined by platform
 #  gb_StaticLibrary_FILENAMES
-#  gb_StaticLibrary_TARGETS
 
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 28c7dd4d4e80..f3b92a34407e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
 
 
 define gb_Library_get_target
-$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
+$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
 endef
 
 define gb_StaticLibrary_get_target
-$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
+$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a8f76bffd204..9d521c79c092 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -165,17 +165,20 @@ endif
 
 include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
+include $(GBUILDDIR)/Tempfile.mk
 
 $(eval $(call gb_Helper_init_registries))
 include $(SRCDIR)/Repository.mk
 include $(SRCDIR)/RepositoryExternal.mk
-$(eval $(call gb_Helper_collect_libtargets))
+$(eval $(call gb_Helper_collect_knownlibs))
 
 gb_Library_DLLPOSTFIX := lo
 
 # Include platform/cpu/compiler specific config/definitions
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
+include $(SRCDIR)/RepositoryFixes.mk
+
 ifeq ($(CROSS_COMPILING),YES)
 # We can safely Assume all cross-compilation is from Unix systems.
 gb_Executable_EXT_for_build :=
@@ -229,12 +232,6 @@ else
 gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
 endif
 
-include $(GBUILDDIR)/Tempfile.mk
-
-include $(SRCDIR)/RepositoryFixes.mk
-
-$(eval $(call gb_Helper_collect_knownlibs))
-
 # add user-supplied flags
 ifneq ($(strip gb__ENV_CFLAGS),)
 gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 600fa43b57c7..f6cae6ad5f4f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -417,7 +417,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 gb_Library_FILENAMES :=\
-	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3