gnumake3: refactoring of gb_*_get_linktargetname

5 files changed, 18 insertions, 14 deletions

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index ad4692c1d846..64286affbd3d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -35,21 +35,23 @@
 #  gb_CppunitTest_get_filename
 gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester)
 gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET)
+gb_CppunitTest_get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
-$(call gb_CppunitTest_get_clean_target,%) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%))
+$(call gb_CppunitTest_get_clean_target,%) :
     $(call gb_Helper_abbreviate_dirs,\
         rm -f $@ $@.log)
 
+
 .PHONY : $(call gb_CppunitTest_get_target,%)
 $(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET)
     $(call gb_Output_announce,$*,$(true),CUT,2)
     $(call gb_Helper_abbreviate_dirs_native,\
         mkdir -p $(dir $@) && \
-        $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktargetname,$(call gb_CppunitTest_get_filename,$*))) > $@.log 2>&1 || (cat $@.log && false))
+        $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktargetname,$*)) > $@.log 2>&1 || (cat $@.log && false))
 
 define gb_CppunitTest_CppunitTest
-$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktargetname,$(call gb_CppunitTest_get_filename,$(1))))
+$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktargetname,$(1)))
 
 endef
 
@@ -58,13 +60,14 @@ $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
 
 endef
 
 define gb_CppunitTest__forward_to_Linktarget
-gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_CppunitTest_get_linktargetname,$$(call gb_CppunitTest_get_filename,$$(1))),$$(2),$$(3))
+gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 478e513c2374..4792a429d55b 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -31,7 +31,7 @@
 gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER)
 
 .PHONY : $(call gb_JunitTest_get_clean_target,%)
-$(call gb_JunitTest_get_clean_target,%) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%))
+$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,$(1)))
     $(call gb_Helper_abbreviate_dirs,\
         rm -f $@ $@.log)
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a15fe61ec405..291fd01e19b8 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -39,10 +39,11 @@
 #  gb_Library_Library_platform
 #  gb_Library_TARGETS
 
+gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
-$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%$(gb_Library_PLAINEXT)))
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
     $(call gb_Helper_abbreviate_dirs,\
         rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
             $(AUXTARGETS))
@@ -59,7 +60,7 @@ $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
 endif
 $(call gb_Library_get_target,$(1)) : AUXTARGETS :=
-$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,$(1))))
+$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
 
 endef
 
@@ -71,6 +72,7 @@ $(call gb_LinkTarget_set_defs,$(2),\
     $(gb_Library_DEFS) \
 )
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
@@ -95,7 +97,7 @@ gb_Library__get_layer_componentprefix = \
 
 
 define gb_Library__forward_to_Linktarget
-gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_Library_get_linktargetname,$$(call gb_Library_get_filename,$$(1))),$$(2),$$(3))
+gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index b49bf246bc96..98f879ec1b36 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -35,10 +35,11 @@
 #  gb_StaticLibrary_FILENAMES
 #  gb_StaticLibrary_TARGETS
 
+gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
-$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_StaticLibrary_get_linktargetname,%$(gb_StaticLibrary_PLAINEXT)))
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) :
     $(call gb_Helper_abbreviate_dirs,\
         rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
             $(AUXTARGETS))
@@ -55,7 +56,7 @@ $$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb
 $$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk))
 endif
 $(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS :=
-$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(call gb_StaticLibrary_get_filename,$(1))))
+$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(1)))
 
 endef
 
@@ -67,6 +68,7 @@ $(call gb_LinkTarget_set_defs,$(2),\
     $(gb_StaticLibrary_DEFS) \
 )
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
@@ -74,7 +76,7 @@ $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(cal
 endef
 
 define gb_StaticLibrary_forward_to_Linktarget
-gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_StaticLibrary_get_linktargetname,$$(call gb_StaticLibrary_get_filename,$$(1))),$$(2),$$(3))
+gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_linktargetname,$$(1)),$$(2),$$(3))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 8a321ec7ffa7..d06f2d691ba7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -128,9 +128,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 # other getters
 
-gb_Library_get_linktargetname = Library/$(1)
-gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1)
-gb_CppunitTest_get_linktargetname = CppunitTest/$(1)
 
 define gb_Library_get_layer
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER)))