From 95f3d4c562939999afe323aca72ac070b466e15f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: [PATCH] CWS gnumake2: module reorg --- ...get_res_fwe.mk => AllLangResTarget_fwe.mk} | 0 .../{prj/target_lib_fwe.mk => Library_fwe.mk} | 0 .../{prj/target_lib_fwi.mk => Library_fwi.mk} | 0 .../{prj/target_lib_fwk.mk => Library_fwk.mk} | 0 .../{prj/target_lib_fwl.mk => Library_fwl.mk} | 0 .../{prj/target_lib_fwm.mk => Library_fwm.mk} | 0 framework/Makefile | 9 +++-- ...odule_framework.mk => Module_framework.mk} | 38 +++++++------------ .../target_package_dtd.mk => Package_dtd.mk} | 0 .../target_package_inc.mk => Package_inc.mk} | 0 ...ackage_uiconfig.mk => Package_uiconfig.mk} | 0 ...ackage_unotypes.mk => Package_unotypes.mk} | 0 ...t_res_sfx2.mk => AllLangResTarget_sfx2.mk} | 0 ...target_lib_qstart.mk => Library_qstart.mk} | 0 .../target_lib_sfx2.mk => Library_sfx2.mk} | 0 sfx2/Makefile | 9 +++-- .../target_module_sfx2.mk => Module_sfx2.mk} | 18 +++------ .../target_package_inc.mk => Package_inc.mk} | 0 .../target_package_sdi.mk => Package_sdi.mk} | 0 .../{prj/target_lib_xo.mk => Library_xo.mk} | 0 .../{prj/target_lib_xof.mk => Library_xof.mk} | 0 xmloff/Makefile | 9 +++-- ...rget_module_xmloff.mk => Module_xmloff.mk} | 18 ++++----- .../target_package_dtd.mk => Package_dtd.mk} | 0 .../target_package_inc.mk => Package_inc.mk} | 0 25 files changed, 41 insertions(+), 60 deletions(-) rename framework/{prj/target_res_fwe.mk => AllLangResTarget_fwe.mk} (100%) rename framework/{prj/target_lib_fwe.mk => Library_fwe.mk} (100%) rename framework/{prj/target_lib_fwi.mk => Library_fwi.mk} (100%) rename framework/{prj/target_lib_fwk.mk => Library_fwk.mk} (100%) rename framework/{prj/target_lib_fwl.mk => Library_fwl.mk} (100%) rename framework/{prj/target_lib_fwm.mk => Library_fwm.mk} (100%) rename framework/{prj/target_module_framework.mk => Module_framework.mk} (59%) rename framework/{prj/target_package_dtd.mk => Package_dtd.mk} (100%) rename framework/{prj/target_package_inc.mk => Package_inc.mk} (100%) rename framework/{prj/target_package_uiconfig.mk => Package_uiconfig.mk} (100%) rename framework/{prj/target_package_unotypes.mk => Package_unotypes.mk} (100%) rename sfx2/{prj/target_res_sfx2.mk => AllLangResTarget_sfx2.mk} (100%) rename sfx2/{prj/target_lib_qstart.mk => Library_qstart.mk} (100%) rename sfx2/{prj/target_lib_sfx2.mk => Library_sfx2.mk} (100%) rename sfx2/{prj/target_module_sfx2.mk => Module_sfx2.mk} (79%) rename sfx2/{prj/target_package_inc.mk => Package_inc.mk} (100%) rename sfx2/{prj/target_package_sdi.mk => Package_sdi.mk} (100%) rename xmloff/{prj/target_lib_xo.mk => Library_xo.mk} (100%) rename xmloff/{prj/target_lib_xof.mk => Library_xof.mk} (100%) rename xmloff/{prj/target_module_xmloff.mk => Module_xmloff.mk} (78%) rename xmloff/{prj/target_package_dtd.mk => Package_dtd.mk} (100%) rename xmloff/{prj/target_package_inc.mk => Package_inc.mk} (100%) diff --git a/framework/prj/target_res_fwe.mk b/framework/AllLangResTarget_fwe.mk similarity index 100% rename from framework/prj/target_res_fwe.mk rename to framework/AllLangResTarget_fwe.mk diff --git a/framework/prj/target_lib_fwe.mk b/framework/Library_fwe.mk similarity index 100% rename from framework/prj/target_lib_fwe.mk rename to framework/Library_fwe.mk diff --git a/framework/prj/target_lib_fwi.mk b/framework/Library_fwi.mk similarity index 100% rename from framework/prj/target_lib_fwi.mk rename to framework/Library_fwi.mk diff --git a/framework/prj/target_lib_fwk.mk b/framework/Library_fwk.mk similarity index 100% rename from framework/prj/target_lib_fwk.mk rename to framework/Library_fwk.mk diff --git a/framework/prj/target_lib_fwl.mk b/framework/Library_fwl.mk similarity index 100% rename from framework/prj/target_lib_fwl.mk rename to framework/Library_fwl.mk diff --git a/framework/prj/target_lib_fwm.mk b/framework/Library_fwm.mk similarity index 100% rename from framework/prj/target_lib_fwm.mk rename to framework/Library_fwm.mk diff --git a/framework/Makefile b/framework/Makefile index 9ab4b8ba83f4..60d34122e271 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/prj/target_module_framework.mk b/framework/Module_framework.mk similarity index 59% rename from framework/prj/target_module_framework.mk rename to framework/Module_framework.mk index 86a30a0b3e45..28b2e087b60f 100644 --- a/framework/prj/target_module_framework.mk +++ b/framework/Module_framework.mk @@ -25,31 +25,19 @@ # #************************************************************************* -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)) - -$(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) \ +$(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 similarity index 100% rename from framework/prj/target_package_dtd.mk rename to framework/Package_dtd.mk diff --git a/framework/prj/target_package_inc.mk b/framework/Package_inc.mk similarity index 100% rename from framework/prj/target_package_inc.mk rename to framework/Package_inc.mk diff --git a/framework/prj/target_package_uiconfig.mk b/framework/Package_uiconfig.mk similarity index 100% rename from framework/prj/target_package_uiconfig.mk rename to framework/Package_uiconfig.mk diff --git a/framework/prj/target_package_unotypes.mk b/framework/Package_unotypes.mk similarity index 100% rename from framework/prj/target_package_unotypes.mk rename to framework/Package_unotypes.mk diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk similarity index 100% rename from sfx2/prj/target_res_sfx2.mk rename to sfx2/AllLangResTarget_sfx2.mk diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/Library_qstart.mk similarity index 100% rename from sfx2/prj/target_lib_qstart.mk rename to sfx2/Library_qstart.mk diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/Library_sfx2.mk similarity index 100% rename from sfx2/prj/target_lib_sfx2.mk rename to sfx2/Library_sfx2.mk diff --git a/sfx2/Makefile b/sfx2/Makefile index 9ab4b8ba83f4..60d34122e271 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 similarity index 79% rename from sfx2/prj/target_module_sfx2.mk rename to sfx2/Module_sfx2.mk index 3ec4e606795f..087c87bed797 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 similarity index 100% rename from sfx2/prj/target_package_inc.mk rename to sfx2/Package_inc.mk diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/Package_sdi.mk similarity index 100% rename from sfx2/prj/target_package_sdi.mk rename to sfx2/Package_sdi.mk diff --git a/xmloff/prj/target_lib_xo.mk b/xmloff/Library_xo.mk similarity index 100% rename from xmloff/prj/target_lib_xo.mk rename to xmloff/Library_xo.mk diff --git a/xmloff/prj/target_lib_xof.mk b/xmloff/Library_xof.mk similarity index 100% rename from xmloff/prj/target_lib_xof.mk rename to xmloff/Library_xof.mk diff --git a/xmloff/Makefile b/xmloff/Makefile index 9ab4b8ba83f4..60d34122e271 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 similarity index 78% rename from xmloff/prj/target_module_xmloff.mk rename to xmloff/Module_xmloff.mk index 6a90531db467..eacc83068dad 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 similarity index 100% rename from xmloff/prj/target_package_dtd.mk rename to xmloff/Package_dtd.mk diff --git a/xmloff/prj/target_package_inc.mk b/xmloff/Package_inc.mk similarity index 100% rename from xmloff/prj/target_package_inc.mk rename to xmloff/Package_inc.mk