summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/AllLangResTarget_fwe.mk (renamed from framework/prj/target_res_fwe.mk)0
-rw-r--r--framework/Library_fwe.mk (renamed from framework/prj/target_lib_fwe.mk)0
-rw-r--r--framework/Library_fwi.mk (renamed from framework/prj/target_lib_fwi.mk)0
-rw-r--r--framework/Library_fwk.mk (renamed from framework/prj/target_lib_fwk.mk)0
-rw-r--r--framework/Library_fwl.mk (renamed from framework/prj/target_lib_fwl.mk)0
-rw-r--r--framework/Library_fwm.mk (renamed from framework/prj/target_lib_fwm.mk)0
-rw-r--r--framework/Makefile9
-rw-r--r--framework/Module_framework.mk43
-rw-r--r--framework/Package_dtd.mk (renamed from framework/prj/target_package_dtd.mk)0
-rw-r--r--framework/Package_inc.mk (renamed from framework/prj/target_package_inc.mk)0
-rw-r--r--framework/Package_uiconfig.mk (renamed from framework/prj/target_package_uiconfig.mk)0
-rw-r--r--framework/Package_unotypes.mk (renamed from framework/prj/target_package_unotypes.mk)0
-rw-r--r--framework/prj/target_module_framework.mk55
-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
-rw-r--r--xmloff/Library_xo.mk (renamed from xmloff/prj/target_lib_xo.mk)0
-rw-r--r--xmloff/Library_xof.mk (renamed from xmloff/prj/target_lib_xof.mk)0
-rw-r--r--xmloff/Makefile9
-rw-r--r--xmloff/Module_xmloff.mk (renamed from xmloff/prj/target_module_xmloff.mk)18
-rw-r--r--xmloff/Package_dtd.mk (renamed from xmloff/prj/target_package_dtd.mk)0
-rw-r--r--xmloff/Package_inc.mk (renamed from xmloff/prj/target_package_inc.mk)0
26 files changed, 71 insertions, 90 deletions
diff --git a/framework/prj/target_res_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 031cb24117..031cb24117 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 718e9c38ea..718e9c38ea 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 0e00df9d83..0e00df9d83 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 8ff8adb4e5..8ff8adb4e5 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 f3ec59fd6c..f3ec59fd6c 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 56a6a9f74f..56a6a9f74f 100644
--- a/framework/prj/target_lib_fwm.mk
+++ b/framework/Library_fwm.mk
diff --git a/framework/Makefile b/framework/Makefile
index 9ab4b8ba83..60d34122e2 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/Module_framework.mk b/framework/Module_framework.mk
new file mode 100644
index 0000000000..28b2e087b6
--- /dev/null
+++ b/framework/Module_framework.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,framework))
+
+$(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 db23783c4e..db23783c4e 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 8cb41e5422..8cb41e5422 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 c92344a153..c92344a153 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 01069ae93d..01069ae93d 100644
--- a/framework/prj/target_package_unotypes.mk
+++ b/framework/Package_unotypes.mk
diff --git a/framework/prj/target_module_framework.mk b/framework/prj/target_module_framework.mk
deleted file mode 100644
index 86a30a0b3e..0000000000
--- a/framework/prj/target_module_framework.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-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,\
- $(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) \
-))
-# vim: set noet ts=4 sw=4:
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
diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/Library_xo.mk
index 5a13d5053f..5a13d5053f 100644
--- a/xmloff/prj/target_lib_xo.mk
+++ b/xmloff/Library_xo.mk
diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/Library_xof.mk
index 320aafbf12..320aafbf12 100644
--- a/xmloff/prj/target_lib_xof.mk
+++ b/xmloff/Library_xof.mk
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 9ab4b8ba83..60d34122e2 100644
--- a/xmloff/Makefile
+++ b/xmloff/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/xmloff/prj/target_module_xmloff.mk b/xmloff/Module_xmloff.mk
index 6a90531db4..eacc83068d 100644
--- a/xmloff/prj/target_module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -25,20 +25,16 @@
#
#*************************************************************************
-$(eval $(call gb_Module_Module,xmloff,\
- $(call gb_Library_get_target,xo) \
- $(call gb_Library_get_target,xof) \
- $(call gb_Package_get_target,xmloff_dtd) \
- $(call gb_Package_get_target,xmloff_inc) \
-))
+$(eval $(call gb_Module_Module,xmloff))
-$(eval $(call gb_Module_read_includes,xmloff,\
- lib_xo \
- lib_xof \
- package_dtd \
- package_inc \
+$(eval $(call gb_Module_add_targets,xmloff,\
+ Library_xo \
+ Library_xof \
+ Package_dtd \
+ Package_inc \
))
#todo: map file
#todo: xmlkywd.lib - built, but never used?!
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/prj/target_package_dtd.mk b/xmloff/Package_dtd.mk
index fbfbe4a140..fbfbe4a140 100644
--- a/xmloff/prj/target_package_dtd.mk
+++ b/xmloff/Package_dtd.mk
diff --git a/xmloff/prj/target_package_inc.mk b/xmloff/Package_inc.mk
index cd0500c6b5..cd0500c6b5 100644
--- a/xmloff/prj/target_package_inc.mk
+++ b/xmloff/Package_inc.mk