diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-25 21:46:32 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-25 21:46:32 +0200 |
| commit | 1f79d3036954bfca21f6ff7ee9a27bf38439924d (patch) | |
| tree | 7fa4275017258cf3dd42242a5cfcbdbee3fdfb53 | |
| parent | 1801d21c82fbdc8e63785313c488ea220456dda4 (diff) | |
CWS gnumake2: intermediate commit (module rework)
| -rw-r--r-- | tools/Makefile | 5 | ||||
| -rw-r--r-- | tools/prj/target_exe_mkunroll.mk | 2 | ||||
| -rw-r--r-- | tools/prj/target_module_tools.mk | 11 |
3 files changed, 5 insertions, 13 deletions
diff --git a/tools/Makefile b/tools/Makefile index 9ab4b8ba83f4..265fdac07bb1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -28,9 +28,6 @@ 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,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk index b1ce83680ef8..9200ab8a3971 100644 --- a/tools/prj/target_exe_mkunroll.mk +++ b/tools/prj/target_exe_mkunroll.mk @@ -73,4 +73,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ dl \ )) endif + +$(info --- $(gb_Module_TARGETSTACK)) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk index 70d14b03dc45..cd260e7709fe 100644 --- a/tools/prj/target_module_tools.mk +++ b/tools/prj/target_module_tools.mk @@ -25,16 +25,9 @@ # #************************************************************************* -$(eval $(call gb_Module_Module,tools,\ - $(call gb_Executable_get_target,mkunroll) \ - $(call gb_Executable_get_target,rscdep) \ - $(call gb_Executable_get_target,so_checksum) \ - $(call gb_Executable_get_target,sspretty) \ - $(call gb_Library_get_target,tl) \ - $(call gb_Package_get_target,tools_inc) \ -)) +$(eval $(call gb_Module_Module,tools)) -$(eval $(call gb_Module_read_includes,tools,\ +$(eval $(call gb_Module_add_targets,tools,\ exe_mkunroll \ exe_rscdep \ exe_so_checksum \ |