CWS gnumake2: module reorg

sw/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:

sw/prj/target_pch_sw.mk → sw/Module_sw.mk

@@ -25,17 +25,18 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_PrecompiledHeader_PrecompiledHeader,precompiled_sw,$(SRCDIR)/sw/inc/pch/precompiled_sw))
+$(eval $(call gb_Module_Module,sw))
 
-$(eval $(call gb_PrecompiledHeader_set_include,precompiled_sw,\
-    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc \
+$(eval $(call gb_Module_add_targets,sw,\
+    Library_sw \
+    Library_swd \
+    Library_swui \
+    Library_msword \
+    Library_vbaswobj \
+    Package_misc \
+    Package_uiconfig \
+    Package_xml \
+    AllLangResTarget_sw \
 ))
 
-$(eval $(call gb_PrecompiledHeader_set_defs,precompiled_sw,\
-    $$(DEFS) \
-    -DACCESSIBLE_LAYOUT \
-))
-
-# vim: set noet sw=4 ts=4:
+# vim: set noet ts=4 sw=4:

sw/prj/target_module_sw.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,sw,\
-    $(call gb_AllLangResTarget_get_target,sw) \
-    $(call gb_Library_get_target,msword) \
-    $(call gb_Library_get_target,sw) \
-    $(call gb_Library_get_target,swd) \
-    $(call gb_Library_get_target,swui) \
-    $(call gb_Library_get_target,vbaswobj) \
-    $(call gb_Package_get_target,sw_uiconfig) \
-    $(call gb_Package_get_target,sw_xml) \
-    $(call gb_Package_get_target,sw_misc) \
-))
-
-$(eval $(call gb_Module_read_includes,sw,\
-    lib_sw \
-    lib_swd \
-    lib_swui \
-    lib_msword \
-    lib_vbaswobj \
-    package_misc \
-    package_uiconfig \
-    package_xml \
-    res_sw \
-))