diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-26 01:29:37 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-26 01:29:37 +0200 |
| commit | f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 (patch) | |
| tree | 591bd5f5f3fddad356faad6697f3b563d5f82ca7 /svl | |
| parent | 1f79d3036954bfca21f6ff7ee9a27bf38439924d (diff) | |
CWS gnumake2: module reorg
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/AllLangResTarget_svl.mk (renamed from svl/prj/target_res_svl.mk) | 0 | ||||
| -rw-r--r-- | svl/Library_fsstorage.mk (renamed from svl/prj/target_lib_fsstorage.mk) | 0 | ||||
| -rw-r--r-- | svl/Library_passwordcontainer.mk (renamed from svl/prj/target_lib_passwordcontainer.mk) | 0 | ||||
| -rw-r--r-- | svl/Library_svl.mk (renamed from svl/prj/target_lib_svl.mk) | 0 | ||||
| -rw-r--r-- | svl/Makefile | 9 | ||||
| -rw-r--r-- | svl/Module_svl.mk (renamed from svl/prj/target_module_svl.mk) | 23 | ||||
| -rw-r--r-- | svl/Package_inc.mk (renamed from svl/prj/target_package_inc.mk) | 0 |
7 files changed, 14 insertions, 18 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 |