module reorg

GNUmakefile

@@ -32,24 +32,6 @@ endif
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-
-include $(foreach module,\
-	framework \
-	sfx2 \
-	svl \
-	svtools \
-	xmloff \
-	sw \
-	toolkit \
-	tools \
-,$(SRCDIR)/$(module)/prj/target_module_$(module).mk)
-
-all : $(foreach module,$(gb_Module_ALLMODULES),$(call gb_Module_get_target,$(module)))
-	$(call gb_Helper_announce,Completed all modules.)
-
-clean : $(foreach module,$(gb_Module_ALLMODULES),$(call gb_Module_get_clean_target,$(module)))
-	$(call gb_Helper_announce,all modules cleaned.)
-
-.DEFAULT_GOAL := all
+$(eval $(call gb_Module_make_global_targets,ooo))
 
 # vim: set noet sw=4 ts=4:

Module_ooo.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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_targets,ooo,$(foreach module,\
+	framework \
+	sfx2 \
+	svl \
+	svtools \
+	xmloff \
+	sw \
+	toolkit \
+	tools \
+,$(module)/Module_$(module))))
+
+# vim: set noet ts=4 sw=4:

solenv/gbuild/alllangres.mk

@@ -274,6 +274,7 @@ $(call gb_AllLangResTarget_get_target,%) :
 define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
 	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1)))
 endef
 
 define gb_AllLangResTarget_add_one_srs

solenv/gbuild/linktarget.mk

@@ -30,7 +30,7 @@
 
 gb_CObject_REPOS := $(gb_REPOS)
 
-gb_CObject_get_source = $(1)$(2).c
+gb_CObject_get_source = $(1)/$(2).c
 # defined by platform
 #  gb_CObject__command
 #  gb_CObject__command_dep

solenv/gbuild/module.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.
+#
+#*************************************************************************
+
+
+# Module class
+
+gb_Module_ALLMODULES :=
+gb_Module_CURRENTMODULE :=
+gb_Module_CURRENTMODULELOCATION :=
+gb_Module_MODULELOCATIONS :=
+gb_Module_TARGETSTACK :=
+gb_Module_CLEANTARGETSTACK :=
+
+.PHONY : $(call gb_Module_get_clean_target,%)
+$(call gb_Module_get_clean_target,%) :
+	$(call gb_Helper_announce,Cleaning up module $* ...)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Module_get_target,$*))
+
+$(call gb_Module_get_target,%) :
+	$(call gb_Helper_announce,Completed module $* ...)
+	-$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		touch $@)
+
+define gb_Module_Module
+gb_Module_ALLMODULES += $(1)
+gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+$(call gb_Module_register_target,$(call gb_Module_get_target,$(1)),$(call gb_Module_get_clean_target,$(1)))
+
+endef
+
+# include the file and pop one target from each stack
+define gb_Module_add_target
+include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2).mk
+$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
+$(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
+
+endef
+
+define gb_Module_add_targets
+$(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target)))
+endef
+
+define gb_Module_make_global_targets
+gb_Module_CURRENTMODULELOCATION := $$(dir $$(realpath $$(firstword $(MAKEFILE_LIST))))
+ifneq ($(1),)
+gb_Module_CURRENTMODULE := $(1)
+else
+gb_Module_CURRENTMODULE := $$(notdir $$(patsubst %/,%,$$(gb_Module_CURRENTMODULELOCATION)))
+endif
+
+include $$(gb_Module_CURRENTMODULELOCATION)Module_$$(gb_Module_CURRENTMODULE).mk 
+
+.PHONY : all clean
+all : $$(call gb_Module_get_target,$$(gb_Module_CURRENTMODULE))
+	$$(call gb_Helper_announce,Build for module $$(gb_Module_CURRENTMODULE) finished (loaded modules: $$(sort $$(gb_Module_ALLMODULES))).)
+
+clean : $$(call gb_Module_get_clean_target,$$(gb_Module_CURRENTMODULE))
+	$$(call gb_Helper_announce,Cleanup for module $$(gb_Module_CURRENTMODULE) finished (loaded modules: $$(sort $$(gb_Module_ALLMODULES))).)
+
+.DEFAULT_GOAL := all
+
+endef
+
+# vim: set noet sw=4 ts=4: