Revert "Make font-based unit test depend on instdir fonts"

The following build:

 $ make clean && make gb_CppunitTest_sc_ucalc
 [...]
 $ cd sc
 $ make gb_CppunitTest_sc_ucalc

triggers:

sc/CppunitTest_sc_subsequent_filters_test.mk:133:
   *** Missing font filelist -> run make more_fonts extras.

This didn't help the general Win32 font build problem AFAIK. There
were additional patches to the way Windows loads the LO provided
fonts, so just revert this.

This reverts commit 368c996b24e09c427a30972b3405493328db6779.

Change-Id: I841f96fe8312c47980c8e3be2e9d88242df5b28d
Reviewed-on: https://gerrit.libreoffice.org/84633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

48 files changed, 81 insertions, 97 deletions

diff --git a/Repository.mk b/Repository.mk
index 965889197a9a..c66b10a856f9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -969,7 +969,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 	extras_fonts \
 	$(if $(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)), \
-		extras_fontconfig) \
+		postprocess_fontconfig) \
 	$(call gb_Helper_optional,MORE_FONTS,\
 		fonts_alef \
 		fonts_amiri \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 80992dfed7e2..062679170b42 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -11,13 +11,6 @@
 
 $(eval $(call gb_Module_Module,libreoffice))
 
-# These have to be included before the others for more_fonts dependencies
-$(eval $(call gb_Module_add_moduledirs,libreoffice,\
-	$(call gb_Helper_optional,MORE_FONTS,external/more_fonts) \
-	extras \
-))
-
-
 # This makefile needs to be read first because some variables like T_LIBS
 # for libmerged are cleared there and then later we append stuff to it
 # through e.g. gb_Library_use_external for various libraries in libmerged.
@@ -62,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	eventattacher \
 	extensions \
 	external \
+	extras \
 	filter \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 6616acceea74..01bf26695377 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -80,17 +80,4 @@ $(eval $(call gb_Module_add_targets,extras,\
 	CustomTarget_opensymbol \
 ))
 
-# For configurations that use fontconfig (cf. inclusion of
-# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
-# instdir/share/fonts/truetype/fc_local.conf when it shall
-# contain content from at least one of external/more_fonts/fc_local.snippet
-# (conditional on MORE_FONTS in BUILD_TYPE) and
-# extras/source/truetype/symbol/fc_local.snippet (unconditional):
-ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
-$(eval $(call gb_Module_add_targets,extras, \
-    CustomTarget_fontconfig \
-    Package_fontconfig \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_fontconfig.mk b/postprocess/CustomTarget_fontconfig.mk
index 384cbb3d7aad..72ff3f3cf1b0 100644
--- a/extras/CustomTarget_fontconfig.mk
+++ b/postprocess/CustomTarget_fontconfig.mk
@@ -7,19 +7,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,extras/fontconfig))
+$(eval $(call gb_CustomTarget_CustomTarget,postprocess/fontconfig))
 
-$(call gb_CustomTarget_get_workdir,extras/fontconfig)/fc_local.conf: \
+$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
     $(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet \
-    $(SRCDIR)/extras/CustomTarget_fontconfig.mk \
-    | $(call gb_CustomTarget_get_workdir,extras/fontconfig)/.dir
+    $(SRCDIR)/postprocess/CustomTarget_fontconfig.mk \
+    | $(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/.dir
 
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
-$(call gb_CustomTarget_get_workdir,extras/fontconfig)/fc_local.conf: \
+$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
     $(SRCDIR)/external/more_fonts/fc_local.snippet
 endif
 
-$(call gb_CustomTarget_get_workdir,extras/fontconfig)/fc_local.conf:
+$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf:
 	printf '<?xml version="1.0"?>\n<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd">\n<fontconfig>\n' >$@
 	cat $(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet >>$@
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 9ccc41552f38..4671cbc84508 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,6 +28,19 @@ $(eval $(call gb_Module_add_targets,postprocess,\
 ))
 endif
 
+# For configurations that use fontconfig (cf. inclusion of
+# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
+# instdir/share/fonts/truetype/fc_local.conf when it shall
+# contain content from at least one of external/more_fonts/fc_local.snippet
+# (conditional on MORE_FONTS in BUILD_TYPE) and
+# extras/source/truetype/symbol/fc_local.snippet (unconditional):
+ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
+$(eval $(call gb_Module_add_targets,postprocess, \
+    CustomTarget_fontconfig \
+    Package_fontconfig \
+))
+endif
+
 ifeq ($(OS),LINUX)
 ifneq ($(PKGFORMAT),)
 $(eval $(call gb_Module_add_check_targets,postprocess,\
diff --git a/extras/Package_fontconfig.mk b/postprocess/Package_fontconfig.mk
index d08a1087185f..37f096e5028e 100644
--- a/extras/Package_fontconfig.mk
+++ b/postprocess/Package_fontconfig.mk
@@ -7,12 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_fontconfig,$(call gb_CustomTarget_get_workdir,extras/fontconfig)))
+$(eval $(call gb_Package_Package,postprocess_fontconfig,$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)))
 
-$(eval $(call gb_Package_add_files,extras_fontconfig,$(LIBO_SHARE_FOLDER)/fonts/truetype, \
+$(eval $(call gb_Package_add_files,postprocess_fontconfig,$(LIBO_SHARE_FOLDER)/fonts/truetype, \
     fc_local.conf \
 ))
 
-$(eval $(call gb_Package_use_custom_target,extras_fontconfig,extras/fontconfig))
+$(eval $(call gb_Package_use_custom_target,postprocess_fontconfig,postprocess/fontconfig))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/PythonTest_solenv_python.mk b/solenv/PythonTest_solenv_python.mk
index 3d3ca68136c0..27145a4e5db3 100644
--- a/solenv/PythonTest_solenv_python.mk
+++ b/solenv/PythonTest_solenv_python.mk
@@ -15,6 +15,4 @@ $(eval $(call gb_PythonTest_add_modules,solenv_python,$(SRCDIR)/solenv/qa/python
 
 $(call gb_PythonTest_get_target,solenv_python): $(call gb_CustomTarget_get_target,solenv/gbuildtesttools)
 
-$(eval $(call gb_PythonTest_use_more_fonts,solenv_python))
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index d013c16cfe3a..22d5ad8b533b 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -72,7 +72,7 @@ $(foreach lang,$(gb_HELP_LANGS),\
 
 $(call gb_AllLangHelp_get_target,$(1)) :| $(dir $(call gb_AllLangHelp_get_target,$(1))).dir
 
-$$(eval $$(call gb_Module_register_target,AllLangHelp_$(1),$(call gb_AllLangHelp_get_target,$(1)),$(call gb_AllLangHelp_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangHelp_get_target,$(1)),$(call gb_AllLangHelp_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),AllLangHelp)
 
 endef
diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index 8afec6fddecf..63789f768ec0 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -91,7 +91,7 @@ $(call gb_Helper_install,$(call gb_AllLangMoTarget_get_target,$(1)), \
 	$(call gb_MoTarget_get_install_target,$(shell $(SRCDIR)/solenv/bin/localestr $(lang))/LC_MESSAGES/$(1)), \
 	$(call gb_MoTarget_get_target,$(1)$(lang))))
 
-$$(eval $$(call gb_Module_register_target,AllLangMoTarget_$(1),$(call gb_AllLangMoTarget_get_target,$(1)),$(call gb_AllLangMoTarget_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangMoTarget_get_target,$(1)),$(call gb_AllLangMoTarget_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),AllLangMoTarget)
 $(call gb_Postprocess_register_target,AllResources,AllLangMoTarget,$(1))
 
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index 958e20b5d5b9..f0cf1c92e70c 100644
--- a/solenv/gbuild/AllLangPackage.mk
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -34,7 +34,7 @@ $(foreach lang,$(gb_AllLangPackage_LANGS),$(call gb_AllLangPackage__AllLangPacka
 
 $(call gb_AllLangPackage_get_target,$(1)) :| $(dir $(call gb_AllLangPackage_get_target,$(1))).dir
 
-$$(eval $$(call gb_Module_register_target,AllLangPackage_$(1),$(call gb_AllLangPackage_get_target,$(1)),$(call gb_AllLangPackage_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangPackage_get_target,$(1)),$(call gb_AllLangPackage_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),AllLangPackage)
 
 endef
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 71d7016f7485..8665644bea78 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -50,7 +50,7 @@ $(call gb_AutoInstall_get_clean_target,%) :
 define gb_AutoInstall_AutoInstall
 $(call gb_AutoInstall_get_target,all) :| $(dir $(call gb_AutoInstall_get_target,all)).dir
 
-$$(eval $$(call gb_Module_register_target,AutoInstall_$(1),$(call gb_AutoInstall_get_target,all),$(call gb_AutoInstall_get_clean_target,all)))
+$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstall_get_target,all),$(call gb_AutoInstall_get_clean_target,all)))
 $(call gb_Helper_make_userfriendly_targets,all,AutoInstall)
 
 endef
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index e0adb83db978..e7fa508efada 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -73,7 +73,7 @@ $(call gb_CliLibrary_get_target,$(1)) :| $(call gb_CliAssembly_get_target,$(1))
 $(call gb_CliLibrary_get_target,$(1)) :| $(dir $(call gb_CliLibrary_get_target,$(1))).dir
 $(call gb_CliLibrary_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_target,$(1))
 
-$$(eval $$(call gb_Module_register_target,CliLibrary_$(1),$(call gb_CliLibrary_get_target,$(1)),$(call gb_CliLibrary_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_CliLibrary_get_target,$(1)),$(call gb_CliLibrary_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CliLibrary)
 
 $(call gb_CliLibrary_get_target,$(1)) :
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index 87b188b8fd23..6ff28ce6f842 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -53,7 +53,7 @@ $(call gb_CliNativeLibrary_get_target,$(1)) :| $(call gb_CliAssembly_get_target,
 $(call gb_CliNativeLibrary_get_target,$(1)) :| $(dir $(call gb_CliNativeLibrary_get_target,$(1))).dir
 $(call gb_CliNativeLibrary_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_target,$(1))
 
-$$(eval $$(call gb_Module_register_target,CliNativeLibrary_$(1),$(call gb_CliNativeLibrary_get_target,$(1)),$(call gb_CliNativeLibrary_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_CliNativeLibrary_get_target,$(1)),$(call gb_CliNativeLibrary_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CliNativeLibrary)
 
 $(call gb_CliNativeLibrary_get_target,$(1)) :
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 153ee7d9e533..d12dc62f7998 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -57,7 +57,7 @@ $(call gb_CliUnoApi_get_target,$(1)) :| $(call gb_CliAssembly_get_target,$(1))
 $(call gb_CliUnoApi_get_target,$(1)) :| $(dir $(call gb_CliUnoApi_get_target,$(1))).dir
 $(call gb_CliUnoApi_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_target,$(1))
 
-$$(eval $$(call gb_Module_register_target,CliUnoApi_$(1),$(call gb_CliUnoApi_get_target,$(1)),$(call gb_CliUnoApi_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_CliUnoApi_get_target,$(1)),$(call gb_CliUnoApi_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApi)
 
 
diff --git a/solenv/gbuild/CompilerTest.mk b/solenv/gbuild/CompilerTest.mk
index f61abc72335f..ad6c55411f19 100644
--- a/solenv/gbuild/CompilerTest.mk
+++ b/solenv/gbuild/CompilerTest.mk
@@ -20,7 +20,7 @@ $(call gb_LinkTarget_get_target,$(2)): COMPILER_TEST := $(true)
 $(call gb_LinkTarget_get_target,$(2)): ENABLE_WERROR := $(true)
 $(call gb_CompilerTest_get_target,$(1)): $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CompilerTest_get_clean_target,$(1)): $(call gb_LinkTarget_get_clean_target,$(2))
-$$(eval $$(call gb_Module_register_target,CompilerTest_$(1),$(call gb_CompilerTest_get_target,$(1)),$(call gb_CompilerTest_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_CompilerTest_get_target,$(1)),$(call gb_CompilerTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CompilerTest)
 
 endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 72fda5e1f675..378a3d5625b4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -311,7 +311,7 @@ $(call gb_Configuration_get_preparation_target,%) :
 define gb_Configuration_Configuration
 $(eval gb_Configuration_NODELIVER_$(1) := $(2))
 
-$$(eval $$(call gb_Module_register_target,Configuration_$(1),$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
 
 endef
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f2a267e3e04b..69eae9169040 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -192,7 +192,7 @@ $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
 $(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS :=
-$$(eval $$(call gb_Module_register_target,CppunitTest_$(1),$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
 
 endef
@@ -367,7 +367,13 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2))
 
 endef
 
-gb_CppunitTest_use_more_fonts = $(call gb_TestHelpers_use_more_fonts,$(call gb_CppunitTest_get_target,$(1)))
+define gb_CppunitTest_use_more_fonts
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(call gb_CppunitTest_get_target,$(1)) : \
+    $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call gb_Package_get_target,$(font)))
+endif
+
+endef
 
 define gb_CppunitTest_use_java_ure
 $(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(true)
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 71dc749aa918..28ffc16af22f 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_clean_target,%) :
 		rm -f $(call gb_CustomTarget_get_target,$*))
 
 define gb_CustomTarget_CustomTarget
-$(eval $(call gb_Module_register_target,CustomTarget_$(1),$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CustomTarget)
 $(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir
 
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 97e7f6f5d677..6c4e6a7490e7 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -227,7 +227,7 @@ $(call gb_Dictionary_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call g
 $(call gb_Dictionary_get_target,$(1)) :| $(dir $(call gb_Dictionary_get_target,$(1))).dir
 $(call gb_Dictionary_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_Dictionary_get_packagesetname,$(1)))
 
-$$(eval $$(call gb_Module_register_target,Dictionary_$(1),$(call gb_Dictionary_get_target,$(1)),$(call gb_Dictionary_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Dictionary_get_target,$(1)),$(call gb_Dictionary_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Dictionary)
 
 endef
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 74b011a311b6..c782cd871856 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -76,7 +76,7 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar
 $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_Executable_Executable_platform,$(1),$(2),$(gb_Executable_BINDIR)/$(1).lib)
 
-$$(eval $$(call gb_Module_register_target,Executable_$(1),$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Executable)
 
 endef
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 0a4c02daf5ea..f23165e1d7bb 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -140,7 +140,7 @@ endif
 $(foreach lang,$(gb_Extension_ALL_LANGS), \
     $(call gb_Extension__compile_help_onelang,$(1),$(lang)))
 
-$$(eval $$(call gb_Module_register_target,Extension_$(1),$(call gb_Extension__get_final_target,$(1)),$(call gb_Extension_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Extension__get_final_target,$(1)),$(call gb_Extension_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Extension,$(call gb_Extension__get_final_target,$(1)))
 
 endef
diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk
index 7a77157bcdd1..e2c99a4764b6 100644
--- a/solenv/gbuild/ExtensionPackage.mk
+++ b/solenv/gbuild/ExtensionPackage.mk
@@ -46,7 +46,7 @@ $(call gb_ExtensionPackage_ExtensionPackage_internal,$(1),$(2))
 $(2) : $(call gb_ExtensionPackage_get_preparation_target,$(1))
 	touch $$@
 
-$$(eval $$(call gb_Module_register_target,ExtensionPackage_$(1),$(call gb_ExtensionPackage_get_target,$(1)),$(call gb_ExtensionPackage_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackage_get_target,$(1)),$(call gb_ExtensionPackage_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackage)
 
 endef
@@ -73,7 +73,7 @@ $(call gb_ExtensionPackageSet_get_target,%) :
 
 # call gb_ExtensionPackageSet_ExtensionPackageSet,set
 define gb_ExtensionPackageSet_ExtensionPackageSet
-$$(eval $$(call gb_Module_register_target,ExtensionPackage_$(1),$(call gb_ExtensionPackageSet_get_target,$(1)),$(call gb_ExtensionPackageSet_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackageSet_get_target,$(1)),$(call gb_ExtensionPackageSet_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackageSet)
 
 endef
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 956f6b9b2811..670106bd95bd 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalPackage_get_clean_target,%) :
 define gb_ExternalPackage_ExternalPackage
 $(call gb_ExternalPackage_ExternalPackage_internal,$(1),$(2))
 
-$$(eval $$(call gb_Module_register_target,ExternalPackage_$(1),$(call gb_ExternalPackage_get_target,$(1)),$(call gb_ExternalPackage_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_ExternalPackage_get_target,$(1)),$(call gb_ExternalPackage_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),ExternalPackage)
 
 endef
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index aa63ee381317..402437d6f567 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get
 $(call gb_ExternalProject_get_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(1))
 $(call gb_ExternalProject_get_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
 
-$$(eval $$(call gb_Module_register_target,ExternalProject_$(1),$(call gb_ExternalProject_get_target,$(1)),$(call gb_ExternalProject_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_ExternalProject_get_target,$(1)),$(call gb_ExternalProject_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject)
 
 endef
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a810715540a1..17569a626e6f 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -146,7 +146,7 @@ $(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(
 $(call gb_Gallery_get_target,$(1)) :| $(dir $(call gb_Gallery_get_target,$(1))).dir \
 	$(call gb_Gallery_get_workdir,$(1))/.dir
 
-$$(eval $$(call gb_Module_register_target,Gallery_$(1),$(call gb_Gallery__get_final_target,$(1)),$(call gb_Gallery_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Gallery__get_final_target,$(1)),$(call gb_Gallery_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Gallery,$(call gb_Gallery__get_final_target,$(1)))
 
 endef
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 527c3b5bfb91..05bbcf43a93e 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -61,7 +61,7 @@ $(call gb_GeneratedPackage_get_clean_target,$(1)) : PACKAGE_DIRS :=
 $(call gb_GeneratedPackage_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_GeneratedPackage_get_target,$(1)) :| $(dir $(call gb_GeneratedPackage_get_target,$(1))).dir
 
-$$(eval $$(call gb_Module_register_target,GeneratedPackage_$(1),$(call gb_GeneratedPackage_get_target,$(1)),$(call gb_GeneratedPackage_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_GeneratedPackage_get_target,$(1)),$(call gb_GeneratedPackage_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),GeneratedPackage)
 
 endef
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index b8093b1df5aa..162af86fc2a8 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -29,7 +29,7 @@ $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_tar
 $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
 $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
 
-$$(eval $$(call gb_Module_register_target,InstallModule_$(1),$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),InstallModule)
 
 endef
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index e227e7105f85..593bd3e0861b 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -62,7 +62,7 @@ define gb_InstallScript_InstallScript
 $(call gb_InstallScript_get_target,$(1)) :| $(dir $(call gb_InstallScript_get_target,$(1))).dir
 $(call gb_InstallScript_get_target,$(1)) : SCP_MODULES :=
 
-$$(eval $$(call gb_Module_register_target,InstallScript_$(1),$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScript_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScript_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
 
 endef
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 9a7708223394..296c783f35fc 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -31,7 +31,7 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(
 $(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
 
-$$(eval $$(call gb_Module_register_target,InternalUnoApi_$(1),$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi)
 
 endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 86dcb45cc9d4..151fb990a0a6 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -105,7 +105,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
 $(call gb_Jar_get_target,$(1)) : \
 	$(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
-$(eval $(call gb_Module_register_target,Jar_$(1),$(call gb_Jar_get_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_Jar_get_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_target,$(1)))
 
 # installed jars need a rule to build!
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 2be9376879ce..236516a72c6c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -67,7 +67,7 @@ $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
 $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR))
 $(if $(HAMCREST_JAR),$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(HAMCREST_JAR)))
 $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
-$(eval $(call gb_Module_register_target,JunitTest_$(1),$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),JunitTest)
 
 endef
@@ -204,7 +204,7 @@ endif
 	@true
 
 define gb_JunitTest_JunitTest
-$(eval $(call gb_Module_register_target,JunitTest_$(1),$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),JunitTest)
 
 endef
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 9680a7b75de3..932ceefcd3cd 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -91,7 +91,7 @@ $(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,Library_$(1),$(call gb_Library_get_exports_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_exports_target,$(1)))
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 4e00a03bdde5..aa3b1cb19485 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -258,7 +258,6 @@ gb_Module_PERFCHECKTARGETSTACK := $(call gb_Module_get_perfcheck_target,$(1)) $(
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK)
 gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call gb_Module__symbols_enabled,$(1))
 gb_Module_CURRENTMODULE_NAME := $(1)
-gb_Module_$(1)_CLASSNAMES :=
 $(call gb_Helper_make_userfriendly_targets,$(1),Module)
 $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\
     $(call gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1)))
@@ -275,15 +274,13 @@ endef
 # should never be inlined ($(call )) as the calls defining it might be sourced
 # before gb_Module.
 define gb_Module_register_target
-gb_Module_CURRENTCLASSNAME := $(1)
-gb_Module_CURRENTTARGET := $(2)
-gb_Module_CURRENTCLEANTARGET := $(3)
+gb_Module_CURRENTTARGET := $(1)
+gb_Module_CURRENTCLEANTARGET := $(2)
 
 endef
 
 # Here we include the file (in it there will be a call to gb_Module_register_target)
 define gb_Module__read_targetfile
-gb_Module_CURRENTCLASSNAME :=
 gb_Module_CURRENTTARGET :=
 gb_Module_CURRENTCLEANTARGET :=
 gb_Module_CURRENTMAKEFILE := $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
@@ -299,14 +296,11 @@ define gb_Module_add_target
 $(if $(filter AllLang% Dictionary% Package_registry,$(2)),$(warning target $(2) should be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
-gb_Module_$(1)_CLASSNAMES += $$(gb_Module_CURRENTCLASSNAME)
 $(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-gb_Module_get_classnames = $(gb_Module_$(1)_CLASSNAMES)
-
 define gb_Module_add_l10n_target
 $(if $(filter AllLang% CustomTarget_autotextshare Dictionary% Package_registry,$(2)),,$(warning target $(2) should not be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
@@ -389,12 +383,11 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 endef
 
 define gb_Module__modulefile
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2)/Module_$(notdir $(2)).mk
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
 endef
 
 define gb_Module_add_moduledir
 $(if $(wildcard $(call gb_Module__modulefile,$(1),$(2))),,$(call gb_Output_error,Module does not exist: $(call gb_Module__modulefile,$(1),$(2))))
-ifeq (,$(filter $(call gb_Module__modulefile,$(1),$(2)),$(MAKEFILE_LIST)))
 include $(call gb_Module__modulefile,$(1),$(2))
 $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
 $(call gb_Module_get_l10n_target,$(1)) : $$(firstword $$(gb_Module_L10NTARGETSTACK))
@@ -416,7 +409,6 @@ gb_Module_STAGINGCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_STAGING
 gb_Module_PERFCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_PERFCHECKTARGETSTACK)),$$(gb_Module_PERFCHECKTARGETSTACK))
 gb_Module_UICHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_UICHECKTARGETSTACK)),$$(gb_Module_UICHECKTARGETSTACK))
 gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
-endif
 
 endef
 
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 45a56ff44478..035a4af064f2 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -81,15 +81,15 @@ $(call gb_Package_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PKG,2)
 	$(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
 	rm -f $@ && \
-	mv $(call var2file,$@.tmp,100,$(sort $(call gb_Package_get_files,$*))) $@
+	mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
 
 # for other targets that want to create Packages, does not register at Module
 define gb_Package_Package_internal
 gb_Package_SOURCEDIR_$(1) := $(2)
 gb_Package_OUTDIR_$(1) := $(INSTROOT)
 $(call gb_Package_get_target,$(1)) : PACKAGE_DEFINED := $(true)
-gb_Package_$(1)_FILES :=
-$(call gb_Package_get_clean_target,$(1)) : override FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
+$(call gb_Package_get_target,$(1)) : FILES :=
+$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
 $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1))
 $(call gb_Package_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_Package_get_target,$(1)) :| $(dir $(call gb_Package_get_target,$(1))).dir
@@ -105,7 +105,7 @@ $$(eval $$(call gb_Output_info,Currently known packages are: $(sort $(gb_Package
 $$(eval $$(call gb_Output_error,Package $(1) must be registered in Repository.mk or RepositoryExternal.mk))
 endif
 $(call gb_Package_Package_internal,$(1),$(2))
-$$(eval $$(call gb_Module_register_target,Package_$(1),$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Package)
 
 endef
@@ -156,7 +156,7 @@ $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
 $$(gb_Package_OUTDIR_$(1))/$(2) :| $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
 	rm -f $$@ && ln -s $(3) $$@
 
-gb_Package_$(1)_FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
+$(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_clean_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
 
 endef
@@ -165,15 +165,12 @@ define gb_Package_add_file
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
-gb_Package_$(1)_FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
+$(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_clean_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call gb_Package_get_preparation_target,$(1)),$$(gb_Package_OUTDIR_$(1)))
 
 endef
 
-# Returns the list of files of a package
-gb_Package_get_files = $(gb_Package_$(1)_FILES)
-
 # Adds several files at once.
 #
 # Files are copied directly into the specified directory.
diff --git a/solenv/gbuild/PackageSet.mk b/solenv/gbuild/PackageSet.mk
index 354bc9f61693..8ba3273f459b 100644
--- a/solenv/gbuild/PackageSet.mk
+++ b/solenv/gbuild/PackageSet.mk
@@ -36,7 +36,7 @@ $(call gb_PackageSet_get_clean_target,%) :
 define gb_PackageSet_PackageSet
 $(call gb_PackageSet_PackageSet_internal,$(1))
 
-$$(eval $$(call gb_Module_register_target,PackageSet_$(1),$(call gb_PackageSet_get_target,$(1)),$(call gb_PackageSet_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_PackageSet_get_target,$(1)),$(call gb_PackageSet_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),PackageSet)
 
 endef
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index ec504d0a4609..1dd5cd692efd 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -37,7 +37,7 @@ $(call gb_Pagein_get_target,%) :
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
 $(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$$(eval $$(call gb_Module_register_target,Pagein_$(1),$(call gb_Pagein__get_install_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_install_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_target,$(1)))
 
 $(call gb_Helper_install_final, \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 9c21ca959852..966cad821b98 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -72,7 +72,7 @@ define gb_PythonTest_PythonTest
 $(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_FOLDER))
 $(call gb_PythonTest_get_target,$(1)) : MODULES :=
 
-$(eval $(call gb_Module_register_target,PythonTest_$(1),$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest)
 
 endef
@@ -99,7 +99,6 @@ $(call gb_PythonTest_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(2))
 
 endef
 
-gb_PythonTest_use_more_fonts = $(call gb_TestHelpers_use_more_fonts,$(call gb_PythonTest_get_target,$(1)))
 
 else # DISABLE_PYTHON
 
@@ -111,7 +110,7 @@ endif
 	@true
 
 define gb_PythonTest_PythonTest
-$(eval $(call gb_Module_register_target,PythonTest_$(1),$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest)
 
 endef
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 3c08806e04ca..b9ccb49a3e2e 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -42,7 +42,7 @@ $(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_
 $(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir
 $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1)))
 
-$$(eval $$(call gb_Module_register_target,Pyuno_$(1),$(call gb_Pyuno_get_final_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_final_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Pyuno,$(call gb_Pyuno_get_final_target,$(1)))
 
 endef
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 6ed6a72b639f..4e5f57810e82 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -35,7 +35,7 @@ $(call gb_Rdb_get_clean_target,%) :
 define gb_Rdb__Rdb_impl
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
 $(call gb_Rdb_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$$(eval $$(call gb_Module_register_target,Rdb_$(1),$(2),$(call gb_Rdb_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(2),$(call gb_Rdb_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(2))
 
 endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index b69b9595e976..0b372043e375 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -45,7 +45,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
-$$(eval $$(call gb_Module_register_target,StaticLibrary_$(1),$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),StaticLibrary)
 
 endef
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 82965a080fca..e7fa50a745b0 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -180,7 +180,7 @@ $(call gb_UIConfig_get_a11yerrors_target,$(1)) : UI_A11YFALSE := $(SRCDIR)/solen
 $(call gb_UIConfig_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call gb_UIConfig_get_packagesetname,$(1)))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_UIConfig_get_packagesetname,$(1)))
 
-$$(eval $$(call gb_Module_register_target,UIConfig_$(1),$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UIConfig)
 $(call gb_Postprocess_register_target,AllUIConfigs,UIConfig,$(1))
 
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index c155348194ca..d558edbc034f 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -96,7 +96,7 @@ $(call gb_UITest_get_target,$(1)) : PYPATH := $(SRCDIR)/uitest$$(gb_CLASSPATHSEP
 $(call gb_UITest_get_target,$(1)) : MODULES :=
 
 $(eval $(call gb_TestHelpers_use_more_fonts,$(call gb_UITest_get_target,$(1))))
-$(eval $(call gb_Module_register_target,UITest_$(1),$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UITest)
 
 endef
@@ -138,7 +138,7 @@ endif
 	@true
 
 define gb_UITest_UITest
-$(eval $(call gb_Module_register_target,UITest_$(1),$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UITest)
 
 endef
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 5223b22ddc5f..d99195d2138c 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -31,7 +31,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clea
 
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
-$$(eval $$(call gb_Module_register_target,UnoApi_$(1),$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
 
 endef
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 5ba30d9fa977..59403de4d9ac 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -212,7 +212,7 @@ endef
 define gb_UnpackedTarball_UnpackedTarball
 $(call gb_UnpackedTarball_UnpackedTarball_internal,$(1))
 
-$$(eval $$(call gb_Module_register_target,UnpackedTarball_$(1),$(call gb_UnpackedTarball_get_final_target,$(1)),$(call gb_UnpackedTarball_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_UnpackedTarball_get_final_target,$(1)),$(call gb_UnpackedTarball_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UnpackedTarball,$(call gb_UnpackedTarball_get_final_target,$(1)))
 
 endef
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index ba00ea6c3109..c110491722c3 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -23,7 +23,7 @@ gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
 
 define gb_WinResTarget_WinResTarget
 $(call gb_WinResTarget_WinResTarget_init,$(1))
-$$(eval $$(call gb_Module_register_target,WinResTarget_$(1),$(call gb_WinResTarget_get_target,$(1)),$(call gb_WinResTarget_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_WinResTarget_get_target,$(1)),$(call gb_WinResTarget_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),WinResTarget)
 
 endef
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index c026e71a41d6..b8f76d98f321 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -91,7 +91,7 @@ define gb_Zip_Zip
 $(call gb_Zip_Zip_internal,$(1),$(2))
 $(call gb_Zip_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 
-$(eval $(call gb_Module_register_target,Zip_$(1),$(call gb_Zip_get_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
+$(eval $(call gb_Module_register_target,$(call gb_Zip_get_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Zip,$(call gb_Zip_get_target,$(1)))
 
 endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d41c40123bc2..774bb5adfc8b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -173,7 +173,6 @@ endif
 include $(GBUILDDIR)/ExternalExecutable.mk
 include $(GBUILDDIR)/TargetLocations.mk
 include $(GBUILDDIR)/Tempfile.mk
-include $(GBUILDDIR)/TestHelpers.mk
 
 $(eval $(call gb_Helper_init_registries))
 include $(SRCDIR)/Repository.mk
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index 8852dea3162f..6d93b6ff2369 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -39,7 +39,6 @@ class CheckGbuildToJson(unittest.TestCase):
     def setUp(self):
         getgbuildtesttools(self)
         clearmakevars()
-        os.environ["gb_IGNORE_MORE_FONTS"] = "1"
         self.tempwork = tempfile.mkdtemp(prefix='gbuild')
 
     def tearDown(self):