do not use gb_Helper_REPOSITORYNAMES anymore

4 files changed, 5 insertions, 25 deletions

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 5f344871c9f4..52a19363ba82 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -53,7 +53,7 @@
 # Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget
 # fails: XcuModuleTarget XcuLangpackTarget XcuResTarget
 #
-gb_Configuration__get_source = $($(gb_Configuration_REPO_$(1)))/$(2)
+gb_Configuration__get_source = $(SRCDIR)/$(2)
 
 
 # XcsTarget class
@@ -64,7 +64,6 @@ $(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs)
 endef
 
 gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-gb_Configuration_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
 
 gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl
 gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl
@@ -315,10 +314,6 @@ $(call gb_Configuration_get_target,%) :
 # cannot use target local variable for REPO because it's needed in prereq
 # last parameter may be used to turn off delivering of files
 define gb_Configuration_Configuration
-$(if $(filter $(2),$(gb_Configuration_REPOSITORYNAMES)),,\
-  $(error Configuration: no or invalid repository given; known repositories: \
-  $(gb_Configuration_REPOSITORYNAMES)))
-$(eval gb_Configuration_REPO_$(1) := $(2))
 $(eval gb_Configuration_NODELIVER_$(1) := $(3))
 $(foreach lang,$(gb_Configuration_LANGS),$(eval \
 	$(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
@@ -426,7 +421,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \
 $(call gb_Configuration_get_target,$(1)) : \
 	$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))
 $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \
-	$($(gb_Configuration_REPO_$(1)))/$(2)/$(3).tmpl
+	$(SRCDIR)/$(2)/$(3).tmpl
 $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
 $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4)
 $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 644ba2c24ec4..624783c339bd 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -26,8 +26,6 @@
 #
 #*************************************************************************
 
-gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
-
 # N.B.: putting the "+" there at the start activates the GNU make job server
 define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
@@ -53,10 +51,6 @@ $(1)/$(2)/Makefile
 endef
 
 define gb_CustomTarget_CustomTarget
-$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
- $(error CustomTarget: no or invalid repository given; known repositories: \
-  $(gb_CustomTarget_REPOSITORYNAMES)))
-gb_CustomTarget_REPO_$(1) := $(2)
 $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
 endef
@@ -64,7 +58,7 @@ endef
 
 define gb_CustomTarget_add_dependency
 $(eval $(call gb_CustomTarget_get_target,$(1)) : \
-	$($(gb_CustomTarget_REPO_$(1)))/$(2))
+	$(SRCDIR)/$(2))
 endef
 
 define gb_CustomTarget_add_dependencies
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 458216b62a49..292d7aee1ddb 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -26,7 +26,6 @@
 #
 #*************************************************************************
 
-gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
 gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
 gb_JavaClassSet_JAVACDEBUG :=
 
@@ -64,20 +63,16 @@ $(call gb_JavaClassSet_get_clean_target,%) :
 # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
 define gb_JavaClassSet_JavaClassSet
-$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\
-  $(error JavaClassSet: no or invalid repository given; known repositories: \
-  $(gb_JavaClassSet_REPOSITORYNAMES)))
-gb_JavaClassSet_REPO_$(1) := $(2)
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 endef
 
 define gb_JavaClassSet__get_sourcefile
-$($(1))/$(2).java
+$(SRCDIR)/$(1).java
 endef
 
 define gb_JavaClassSet_add_sourcefile
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : \
-   $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2)))
+   $(call gb_JavaClassSet__get_sourcefile,$(2)))
 endef
 
 define gb_JavaClassSet_add_sourcefiles
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 816fb85adc63..35c05c2b6e37 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -47,10 +47,6 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_ta
 	mkdir -p $$(dir $$@)
 
 define gb_UnoApiTarget_UnoApiTarget
-$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
- $(error UnoApiTarget: no or invalid repository given; known repositories: \
-  $(gb_Helper_REPOSITORYNAMES)))
-gb_UnoApiTarget_REPO_$(1) := $(2)
 $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
 $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
 $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))