CWS gnumake2: module reorg

12 files changed, 17 insertions, 65 deletions

diff --git a/sw/prj/target_res_sw.mk b/sw/AllLangResTarget_sw.mk
index ba552333d2fa..ba552333d2fa 100644
--- a/sw/prj/target_res_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
diff --git a/sw/prj/target_lib_msword.mk b/sw/Library_msword.mk
index eb891976fcc2..eb891976fcc2 100644
--- a/sw/prj/target_lib_msword.mk
+++ b/sw/Library_msword.mk
diff --git a/sw/prj/target_lib_sw.mk b/sw/Library_sw.mk
index ddd2f4507110..ddd2f4507110 100644
--- a/sw/prj/target_lib_sw.mk
+++ b/sw/Library_sw.mk
diff --git a/sw/prj/target_lib_swd.mk b/sw/Library_swd.mk
index 1d185e8f4267..1d185e8f4267 100644
--- a/sw/prj/target_lib_swd.mk
+++ b/sw/Library_swd.mk
diff --git a/sw/prj/target_lib_swui.mk b/sw/Library_swui.mk
index 12227c9a0ae8..12227c9a0ae8 100644
--- a/sw/prj/target_lib_swui.mk
+++ b/sw/Library_swui.mk
diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/Library_vbaswobj.mk
index a6d20bd530cc..a6d20bd530cc 100644
--- a/sw/prj/target_lib_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
diff --git a/sw/Makefile b/sw/Makefile
index 9ab4b8ba83f4..60d34122e271 100644
--- a/sw/Makefile
+++ b/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:
diff --git a/sw/prj/target_pch_sw.mk b/sw/Module_sw.mk
index 1ef7f12f0a3b..13f511a73b82 100755..100644
--- a/sw/prj/target_pch_sw.mk
+++ b/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:
diff --git a/sw/prj/target_package_misc.mk b/sw/Package_misc.mk
index bb2e3cd8dc7f..bb2e3cd8dc7f 100644
--- a/sw/prj/target_package_misc.mk
+++ b/sw/Package_misc.mk
diff --git a/sw/prj/target_package_uiconfig.mk b/sw/Package_uiconfig.mk
index 6ec1b30c0509..6ec1b30c0509 100644
--- a/sw/prj/target_package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
diff --git a/sw/prj/target_package_xml.mk b/sw/Package_xml.mk
index 7eb3f1cb1f3f..7eb3f1cb1f3f 100644
--- a/sw/prj/target_package_xml.mk
+++ b/sw/Package_xml.mk
diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk
deleted file mode 100755
index 20e4944877dd..000000000000
--- a/sw/prj/target_module_sw.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# 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 \
-))