more multi-repo work for modules

GNUmakefile

@@ -32,7 +32,7 @@ endif
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,ooo))
+$(eval $(call gb_Module_make_global_targets,Module_ooo.mk))
 
 include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST))))
 

Targetnames.mk

@@ -84,9 +84,6 @@ gb_Library_PLAINLIBS_URE :=\
 gb_Library_PLAINLIBS_OOO :=\
 	icuuc \
 
-gb_Library_PLAINLIBS := \
-	$(gb_Library_PLAINLIBS_URE) \
-	$(gb_Library_PLAINLIBS_OOO) \
 
 # => OOOLIB
 gb_Library_RTLIBS :=\
@@ -113,9 +110,6 @@ gb_Library_UNOLIBS_OOO := \
 	productregistration \
 	vbaswobj \
 
-gb_Library_UNOLIBS := \
-	$(gb_Library_UNOLIBS_URE) \
-	$(gb_Library_UNOLIBS_OOO) \
 
 # => URELIB
 gb_Library_UNOVERLIBS :=\

solenv/gbuild/Module.mk

@@ -32,7 +32,7 @@ gb_Module_ALLMODULES :=
 gb_Module_MODULELOCATIONS :=
 gb_Module_TARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
-gb_Module_CURRENTBASEDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+gb_Module_CURRENTREPO := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
@@ -85,17 +85,15 @@ $(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
 endef
 
 define gb_Module_set_current_repo
-gb_Module_CURRENTBASEDIR := $$(dir $$(realpath $$(lastword $$(MAKEFILE_LIST))))
+gb_Module_CURRENTREPO := $$(firstword $(1) $$(dir $$(realpath $$(lastword $$(MAKEFILE_LIST)))))
 endef
 
-
 define gb_Module_make_global_targets
 ifneq ($$(gb_Module_TARGETSTACK),)
 $$(warn corrupted module target stack!)
 endif
 
-$(call gb_Module__add_toplevel_module,$$(firstword $(1) $$(notdir $$(patsubst %/,%,$$(gb_Module_CURRENTBASEDIR)))))
-include $$(gb_Module_CURRENTBASEDIR)Module_$$(firstword $(1) $$(notdir $$(patsubst %/,%,$$(gb_Module_CURRENTBASEDIR)))).mk
+include $(gb_Module_CURRENTREPO)/$(1)
 
 all : $$(firstword $$(gb_Module_TARGETSTACK))
 clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))

solenv/gbuild/gbuild.mk

@@ -111,6 +111,14 @@ include $(GBUILDDIR)/Helper.mk
 gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER
 gb_StaticLibrary_NAMESCHEMES := PLAIN
 include $(foreach repo,$(gb_REPOS),$(repo)/Targetnames.mk)
+gb_Library_PLAINLIBS := \
+	$(gb_Library_PLAINLIBS_URE) \
+	$(gb_Library_PLAINLIBS_OOO) \
+
+gb_Library_UNOLIBS := \
+	$(gb_Library_UNOLIBS_URE) \
+	$(gb_Library_UNOLIBS_OOO) \
+
 gb_Library_TARGETS := $(foreach namescheme,$(gb_Library_NAMESCHEMES),$(gb_Library_$(namescheme)LIBS))
 gb_StaticLibrary_TARGETS := $(foreach namescheme,$(gb_StaticLibrary_NAMESCHEMES),$(gb_StaticLibrary_$(namescheme)LIBS))