more multi-repo work for modules

GNUmakefile

@@ -25,14 +25,10 @@
 #
 #*************************************************************************
 
-ifeq ($(strip $(SOLARENV)),)
-$(error No environment set)
-endif
-
-GBUILDDIR := $(SOLARENV)/gbuild
+include $(dir $(firstword $MAKEFILE_LIST))/SourcePaths.mk
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,Module_ooo.mk))
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_ooo.mk))
 
 include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST))))
 

SourcePaths.mk

+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set)
+endif
+ifeq ($(OS),WNT)
+SRCDIR := $(shell cygpath -u $(SRCDIR))
+else
+SRCDIR := $(SOLARSRC)
+endif
+CURRENTREPO := $(SRCDIR)
+
+GBUILDDIR := $(SOLARENV)/gbuild

solenv/gbuild/Module.mk

@@ -32,7 +32,6 @@ gb_Module_ALLMODULES :=
 gb_Module_MODULELOCATIONS :=
 gb_Module_TARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
-gb_Module_CURRENTREPO := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
@@ -84,16 +83,12 @@ define gb_Module_add_moduledirs
 $(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
 endef
 
-define gb_Module_set_current_repo
-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
 
-include $(gb_Module_CURRENTREPO)/$(1)
+include $(1)
 
 all : $$(firstword $$(gb_Module_TARGETSTACK))
 clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))

solenv/gbuild/gbuild.mk

@@ -57,16 +57,14 @@ endif
 # extend for JDK include (seems only needed in setsolar env?)
 SOLARINC += $(JDKINCS)
 
-SRCDIR := $(SOLARSRC)
 OUTDIR := $(SOLARVERSION)/$(INPATH)
 WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
 ifeq ($(strip $(gb_REPOS)),)
-gb_REPOS := $(SOLARSRC)
+gb_REPOS := $(SRCDIR)
 endif
 
 # HACK
 ifeq ($(OS),WNT)
-SRCDIR := $(shell cygpath -u $(SRCDIR))
 WORKDIR := $(shell cygpath -u $(WORKDIR))
 OUTDIR := $(shell cygpath -u $(OUTDIR))
 gb_REPOS := $(shell cygpath -u $(gb_REPOS))