CWS gnumake2: module reorg

svl/Makefile

@@ -25,12 +25,13 @@
 #
 #*************************************************************************
 
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set)
+endif
+
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-
-gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
-
-$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+$(eval $(call gb_Module_make_global_targets))
 
 # vim: set noet sw=4 ts=4:

svl/prj/target_module_svl.mk → svl/Module_svl.mk

@@ -25,23 +25,18 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Module_read_includes,svl,\
-    lib_svl \
-    lib_fsstorage \
-    lib_passwordcontainer \
-    res_svl \
-    package_inc \
-))
+$(eval $(call gb_Module_Module,svl))
 
-$(eval $(call gb_Module_Module,svl,\
-    $(call gb_AllLangResTarget_get_target,svl) \
-    $(call gb_Library_get_target,fsstorage) \
-    $(call gb_Library_get_target,passwordcontainer) \
-    $(call gb_Library_get_target,svl) \
-    $(call gb_Package_get_target,svl_inc) \
+$(eval $(call gb_Module_add_targets,svl,\
+    AllLangResTarget_svl \
+    Library_fsstorage \
+    Library_passwordcontainer \
+    Library_svl \
+    Package_inc \
 ))
 
-
 #todo: dde platform dependent
 #todo: package_inc
 #todo: map file
+
+# vim: set noet ts=4 sw=4:

svtools/Makefile

@@ -25,12 +25,13 @@
 #
 #*************************************************************************
 
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set)
+endif
+
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-
-gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
-
-$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+$(eval $(call gb_Module_make_global_targets))
 
 # vim: set noet sw=4 ts=4:

svtools/Module_svtools.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,svtools))
+
+$(eval $(call gb_Module_add_targets,svtools,\
+    AllLangResTarget_productregistration \
+    AllLangResTarget_svt \
+    Executable_bmp \
+    Executable_bmpsum \
+    Executable_g2g \
+    Library_hatchwindowfactory \
+    Library_productregistration \
+    Library_svt \
+    Package_inc \
+))
+
+#todo: javapatchres
+#todo: jpeg on mac in svtools/util/makefile.mk
+#todo: deliver errtxt.src as ehdl.srs
+#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog
+#todo: map file
+
+# vim: set noet sw=4 ts=4:

svtools/prj/target_module_svtools.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,svtools,\
-    $(call gb_AllLangResTarget_get_target,productregistration) \
-    $(call gb_AllLangResTarget_get_target,svt) \
-    $(call gb_Executable_get_target,bmp) \
-    $(call gb_Executable_get_target,bmpsum) \
-    $(call gb_Executable_get_target,g2g) \
-    $(call gb_Library_get_target,hatchwindowfactory) \
-    $(call gb_Library_get_target,productregistration) \
-    $(call gb_Library_get_target,svt) \
-    $(call gb_Package_get_target,svtools_inc) \
-))
-
-$(eval $(call gb_Module_read_includes,svtools,\
-    exe_bmp \
-    exe_bmpsum \
-    exe_g2g \
-    lib_hatchwindowfactory \
-    lib_productregistration \
-    lib_svt \
-    package_inc \
-    res_productregistration \
-    res_svt \
-))
-
-#todo: javapatchres
-#todo: jpeg on mac in svtools/util/makefile.mk
-#todo: deliver errtxt.src as ehdl.srs
-#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog
-#todo: map file
-# vim: set noet sw=4 ts=4:

toolkit/Makefile

@@ -25,12 +25,13 @@
 #
 #*************************************************************************
 
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set)
+endif
+
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-
-gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
-
-$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+$(eval $(call gb_Module_make_global_targets))
 
 # vim: set noet sw=4 ts=4:

toolkit/prj/target_module_toolkit.mk → toolkit/Module_toolkit.mk

@@ -25,19 +25,14 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Module_read_includes,toolkit,\
-    lib_tk \
-    package_inc \
-    package_source \
-    package_util \
-    res_tk \
-))
+$(eval $(call gb_Module_Module,toolkit))
 
-$(eval $(call gb_Module_Module,toolkit,\
-    $(call gb_AllLangResTarget_get_target,tk) \
-    $(call gb_Library_get_target,tk) \
-    $(call gb_Package_get_target,toolkit_inc) \
-    $(call gb_Package_get_target,toolkit_source) \
-    $(call gb_Package_get_target,toolkit_util) \
+$(eval $(call gb_Module_add_targets,toolkit,\
+    Library_tk \
+    Package_inc \
+    Package_source \
+    Package_util \
+    AllLangResTarget_tk \
 ))
+
 # vim: set noet sw=4 ts=4:

tools/prj/target_exe_mkunroll.mk → tools/Executable_mkunroll.mk

@@ -74,5 +74,4 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
 ))
 endif
 
-$(info --- $(gb_Module_TARGETSTACK))
 # vim: set noet sw=4 ts=4:

tools/Makefile

@@ -25,9 +25,13 @@
 #
 #*************************************************************************
 
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set)
+endif
+
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))))
+$(eval $(call gb_Module_make_global_targets))
 
 # vim: set noet sw=4 ts=4:

tools/prj/target_module_tools.mk → tools/Module_tools.mk

@@ -28,12 +28,12 @@
 $(eval $(call gb_Module_Module,tools))
 
 $(eval $(call gb_Module_add_targets,tools,\
-    exe_mkunroll \
-    exe_rscdep \
-    exe_so_checksum \
-    exe_sspretty \
-    lib_tl \
-    package_inc \
+    Executable_mkunroll \
+    Executable_rscdep \
+    Executable_so_checksum \
+    Executable_sspretty \
+    Library_tl \
+    Package_inc \
 ))
 
 # TODO:
@@ -50,3 +50,5 @@ $(eval $(call gb_Module_add_targets,tools,\
 
 #todo: link tools dynamically everywhere
 #todo: ALWAYSDBGFLAG etc.
+
+# vim: set noet sw=4 ts=4: