CWS gnumake2: module reorg

12 files changed, 18 insertions, 29 deletions

diff --git a/framework/prj/target_res_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 031cb24117d7..031cb24117d7 100644
--- a/framework/prj/target_res_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
diff --git a/framework/prj/target_lib_fwe.mk b/framework/Library_fwe.mk
index 718e9c38ea22..718e9c38ea22 100644
--- a/framework/prj/target_lib_fwe.mk
+++ b/framework/Library_fwe.mk
diff --git a/framework/prj/target_lib_fwi.mk b/framework/Library_fwi.mk
index 0e00df9d8300..0e00df9d8300 100644
--- a/framework/prj/target_lib_fwi.mk
+++ b/framework/Library_fwi.mk
diff --git a/framework/prj/target_lib_fwk.mk b/framework/Library_fwk.mk
index 8ff8adb4e5fb..8ff8adb4e5fb 100644
--- a/framework/prj/target_lib_fwk.mk
+++ b/framework/Library_fwk.mk
diff --git a/framework/prj/target_lib_fwl.mk b/framework/Library_fwl.mk
index f3ec59fd6c61..f3ec59fd6c61 100644
--- a/framework/prj/target_lib_fwl.mk
+++ b/framework/Library_fwl.mk
diff --git a/framework/prj/target_lib_fwm.mk b/framework/Library_fwm.mk
index 56a6a9f74f6b..56a6a9f74f6b 100644
--- a/framework/prj/target_lib_fwm.mk
+++ b/framework/Library_fwm.mk
diff --git a/framework/Makefile b/framework/Makefile
index 9ab4b8ba83f4..60d34122e271 100644
--- a/framework/Makefile
+++ b/framework/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/framework/prj/target_module_framework.mk b/framework/Module_framework.mk
index 86a30a0b3e45..28b2e087b60f 100644
--- a/framework/prj/target_module_framework.mk
+++ b/framework/Module_framework.mk
@@ -25,31 +25,19 @@
 #
 #*************************************************************************
 
-include $(foreach targetdef,\
-    lib_fwe \
-    lib_fwi \
-    lib_fwk \
-    lib_fwl \
-    lib_fwm \
-    package_dtd \
-    package_inc \
-    package_uiconfig \
-    package_unotypes \
-    res_fwe \
-,$(SRCDIR)/framework/prj/target_$(targetdef).mk)
+$(eval $(call gb_Module_Module,framework))
 
-
-$(eval $(call gb_Module_Module,framework,\
-    $(call gb_AllLangResTarget_get_target,fwe) \
-    $(call gb_Library_get_target,fwe) \
-    $(call gb_Library_get_target,fwi) \
-    $(call gb_Library_get_target,fwk) \
-    $(call gb_Library_get_target,fwl) \
-    $(call gb_Library_get_target,fwm) \
-    $(call gb_Library_get_target,fwe) \
-    $(call gb_Package_get_target,framework_dtd) \
-    $(call gb_Package_get_target,framework_inc) \
-    $(call gb_Package_get_target,framework_uiconfig) \
-    $(call gb_Package_get_target,framework_unotypes) \
+$(eval $(call gb_Module_add_targets,framework,\
+    AllLangResTarget_fwe \
+    Library_fwe \
+    Library_fwi \
+    Library_fwk \
+    Library_fwl \
+    Library_fwm \
+    Package_dtd \
+    Package_inc \
+    Package_uiconfig \
+    Package_unotypes \
 ))
+
 # vim: set noet ts=4 sw=4:
diff --git a/framework/prj/target_package_dtd.mk b/framework/Package_dtd.mk
index db23783c4ef9..db23783c4ef9 100644
--- a/framework/prj/target_package_dtd.mk
+++ b/framework/Package_dtd.mk
diff --git a/framework/prj/target_package_inc.mk b/framework/Package_inc.mk
index 8cb41e542265..8cb41e542265 100644
--- a/framework/prj/target_package_inc.mk
+++ b/framework/Package_inc.mk
diff --git a/framework/prj/target_package_uiconfig.mk b/framework/Package_uiconfig.mk
index c92344a153f5..c92344a153f5 100644
--- a/framework/prj/target_package_uiconfig.mk
+++ b/framework/Package_uiconfig.mk
diff --git a/framework/prj/target_package_unotypes.mk b/framework/Package_unotypes.mk
index 01069ae93dc4..01069ae93dc4 100644
--- a/framework/prj/target_package_unotypes.mk
+++ b/framework/Package_unotypes.mk