summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-26 01:29:37 +0200
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-26 01:29:37 +0200
commitb24480b9d94a777402ce5fa0895f32815f6b1cd0 (patch)
treee70cf823f87d6cec4ed7538e2b658359b0a526c1 /sfx2
parent59d25adbde48f123bf5a39bbbb9c27ff085f34b4 (diff)
CWS gnumake2: module reorg
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/AllLangResTarget_sfx2.mk (renamed from sfx2/prj/target_res_sfx2.mk)0
-rw-r--r--sfx2/Library_qstart.mk (renamed from sfx2/prj/target_lib_qstart.mk)0
-rw-r--r--sfx2/Library_sfx2.mk (renamed from sfx2/prj/target_lib_sfx2.mk)0
-rw-r--r--sfx2/Makefile9
-rw-r--r--sfx2/Module_sfx2.mk (renamed from sfx2/prj/target_module_sfx2.mk)18
-rw-r--r--sfx2/Package_inc.mk (renamed from sfx2/prj/target_package_inc.mk)0
-rw-r--r--sfx2/Package_sdi.mk (renamed from sfx2/prj/target_package_sdi.mk)0
7 files changed, 11 insertions, 16 deletions
diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index b51079559e..b51079559e 100644
--- a/sfx2/prj/target_res_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/Library_qstart.mk
index 2da2ada42d..2da2ada42d 100644
--- a/sfx2/prj/target_lib_qstart.mk
+++ b/sfx2/Library_qstart.mk
diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/Library_sfx2.mk
index 9c1dc852e6..9c1dc852e6 100644
--- a/sfx2/prj/target_lib_sfx2.mk
+++ b/sfx2/Library_sfx2.mk
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 9ab4b8ba83..60d34122e2 100644
--- a/sfx2/Makefile
+++ b/sfx2/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/sfx2/prj/target_module_sfx2.mk b/sfx2/Module_sfx2.mk
index 3ec4e60679..087c87bed7 100644
--- a/sfx2/prj/target_module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -25,19 +25,13 @@
#
#*************************************************************************
-$(eval $(call gb_Module_Module,sfx2,\
- $(call gb_AllLangResTarget_get_target,sfx) \
- $(call gb_Library_get_target,sfx) \
- $(call gb_Package_get_target,sfx2_inc) \
- $(call gb_Package_get_target,sfx2_sdi) \
-))
-# $(call gb_Library_get_target,qstart) \
+$(eval $(call gb_Module_Module,sfx2))
-$(eval $(call gb_Module_read_includes,sfx2,\
- lib_sfx2 \
- package_inc \
- package_sdi \
- res_sfx2 \
+$(eval $(call gb_Module_add_targets,sfx2,\
+ AllLangResTarget_sfx2 \
+ Library_sfx2 \
+ Package_inc \
+ Package_sdi \
))
# lib_qstart \
diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/Package_inc.mk
index dd836b286f..dd836b286f 100644
--- a/sfx2/prj/target_package_inc.mk
+++ b/sfx2/Package_inc.mk
diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/Package_sdi.mk
index 63f2138adf..63f2138adf 100644
--- a/sfx2/prj/target_package_sdi.mk
+++ b/sfx2/Package_sdi.mk