33 files changed, 57 insertions, 68 deletions
diff --git a/svl/prj/target_res_svl.mk b/svl/AllLangResTarget_svl.mk
index 6759202a5fa4..6759202a5fa4 100644
--- a/svl/prj/target_res_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
diff --git a/svl/prj/target_lib_fsstorage.mk b/svl/Library_fsstorage.mk
index 6db23b4ae547..6db23b4ae547 100644
--- a/svl/prj/target_lib_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
diff --git a/svl/prj/target_lib_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 4285efa53a0b..4285efa53a0b 100644
--- a/svl/prj/target_lib_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
diff --git a/svl/prj/target_lib_svl.mk b/svl/Library_svl.mk
index bfa5cfaa96ee..bfa5cfaa96ee 100644
--- a/svl/prj/target_lib_svl.mk
+++ b/svl/Library_svl.mk
diff --git a/svl/Makefile b/svl/Makefile
index 9ab4b8ba83f4..60d34122e271 100644
--- a/svl/Makefile
+++ b/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:
diff --git a/svl/prj/target_module_svl.mk b/svl/Module_svl.mk
index ac4a2ba621fe..6bba7a0836f7 100644
--- a/svl/prj/target_module_svl.mk
+++ b/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:
diff --git a/svl/prj/target_package_inc.mk b/svl/Package_inc.mk
index e2814e6eddab..e2814e6eddab 100644
--- a/svl/prj/target_package_inc.mk
+++ b/svl/Package_inc.mk
diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk
index af510d338c6e..af510d338c6e 100644
--- a/svtools/prj/target_res_productregistration.mk
+++ b/svtools/AllLangResTarget_productregistration.mk
diff --git a/svtools/prj/target_res_svt.mk b/svtools/AllLangResTarget_svt.mk
index 1e3e21b7ca6b..1e3e21b7ca6b 100644
--- a/svtools/prj/target_res_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/Executable_bmp.mk
index 57b34292ff11..57b34292ff11 100644
--- a/svtools/prj/target_exe_bmp.mk
+++ b/svtools/Executable_bmp.mk
diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/Executable_bmpsum.mk
index ec0f90f2b04b..ec0f90f2b04b 100644
--- a/svtools/prj/target_exe_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/Executable_g2g.mk
index 4bba4dc2644f..4bba4dc2644f 100644
--- a/svtools/prj/target_exe_g2g.mk
+++ b/svtools/Executable_g2g.mk
diff --git a/svtools/prj/target_lib_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 448517271e19..448517271e19 100644
--- a/svtools/prj/target_lib_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
diff --git a/svtools/prj/target_lib_productregistration.mk b/svtools/Library_productregistration.mk
index 7dc480c8ea5a..7dc480c8ea5a 100644
--- a/svtools/prj/target_lib_productregistration.mk
+++ b/svtools/Library_productregistration.mk
diff --git a/svtools/prj/target_lib_svt.mk b/svtools/Library_svt.mk
index 8968775b8e7c..8968775b8e7c 100644
--- a/svtools/prj/target_lib_svt.mk
+++ b/svtools/Library_svt.mk
diff --git a/svtools/Makefile b/svtools/Makefile
index 9ab4b8ba83f4..60d34122e271 100644
--- a/svtools/Makefile
+++ b/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:
diff --git a/svtools/prj/target_module_svtools.mk b/svtools/Module_svtools.mk
index 88e6228b83e4..bc760add6d26 100644
--- a/svtools/prj/target_module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -25,28 +25,18 @@
 #
 #*************************************************************************
 
-$(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_Module,svtools))
 
-$(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 \
+$(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
@@ -54,4 +44,5 @@ $(eval $(call gb_Module_read_includes,svtools,\
 #todo: deliver errtxt.src as ehdl.srs
 #todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog
 #todo: map file
+
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/prj/target_package_inc.mk b/svtools/Package_inc.mk
index f47251f31590..f47251f31590 100644
--- a/svtools/prj/target_package_inc.mk
+++ b/svtools/Package_inc.mk
diff --git a/toolkit/prj/target_res_tk.mk b/toolkit/AllLangResTarget_tk.mk
index 571d5dfbff70..571d5dfbff70 100644
--- a/toolkit/prj/target_res_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
diff --git a/toolkit/prj/target_lib_tk.mk b/toolkit/Library_tk.mk
index 60d13418fa5b..60d13418fa5b 100644
--- a/toolkit/prj/target_lib_tk.mk
+++ b/toolkit/Library_tk.mk
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 9ab4b8ba83f4..60d34122e271 100644
--- a/toolkit/Makefile
+++ b/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:
diff --git a/toolkit/prj/target_module_toolkit.mk b/toolkit/Module_toolkit.mk
index b6723fd8403d..ce54e3243fe4 100644
--- a/toolkit/prj/target_module_toolkit.mk
+++ b/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:
diff --git a/toolkit/prj/target_package_inc.mk b/toolkit/Package_inc.mk
index be23e1a95a1c..be23e1a95a1c 100644
--- a/toolkit/prj/target_package_inc.mk
+++ b/toolkit/Package_inc.mk
diff --git a/toolkit/prj/target_package_source.mk b/toolkit/Package_source.mk
index 8a5aa5ffc3cb..8a5aa5ffc3cb 100644
--- a/toolkit/prj/target_package_source.mk
+++ b/toolkit/Package_source.mk
diff --git a/toolkit/prj/target_package_util.mk b/toolkit/Package_util.mk
index 990248eb142d..990248eb142d 100644
--- a/toolkit/prj/target_package_util.mk
+++ b/toolkit/Package_util.mk
diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/Executable_mkunroll.mk
index 9200ab8a3971..4ee724d8ffc0 100644
--- a/tools/prj/target_exe_mkunroll.mk
+++ b/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:
diff --git a/tools/prj/target_exe_rscdep.mk b/tools/Executable_rscdep.mk
index 20f4d22b186c..20f4d22b186c 100644
--- a/tools/prj/target_exe_rscdep.mk
+++ b/tools/Executable_rscdep.mk
diff --git a/tools/prj/target_exe_so_checksum.mk b/tools/Executable_so_checksum.mk
index d852c22ef5de..d852c22ef5de 100644
--- a/tools/prj/target_exe_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
diff --git a/tools/prj/target_exe_sspretty.mk b/tools/Executable_sspretty.mk
index 5b8c83977dcd..5b8c83977dcd 100644
--- a/tools/prj/target_exe_sspretty.mk
+++ b/tools/Executable_sspretty.mk
diff --git a/tools/prj/target_lib_tl.mk b/tools/Library_tl.mk
index 2fc00ec68a8b..2fc00ec68a8b 100644
--- a/tools/prj/target_lib_tl.mk
+++ b/tools/Library_tl.mk
diff --git a/tools/Makefile b/tools/Makefile
index 265fdac07bb1..60d34122e271 100644
--- a/tools/Makefile
+++ b/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:
diff --git a/tools/prj/target_module_tools.mk b/tools/Module_tools.mk
index cd260e7709fe..447aba59cb50 100644
--- a/tools/prj/target_module_tools.mk
+++ b/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:
diff --git a/tools/prj/target_package_inc.mk b/tools/Package_inc.mk
index 5deb59a7b0da..5deb59a7b0da 100644
--- a/tools/prj/target_package_inc.mk
+++ b/tools/Package_inc.mk