diff options
| -rw-r--r-- | Repository.mk | 9 | ||||
| -rw-r--r-- | scp2/AutoInstallLibs_base.mk | 12 | ||||
| -rw-r--r-- | scp2/InstallModule_base.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
| -rw-r--r-- | scp2/source/base/file_base.scp | 3 | ||||
| -rw-r--r-- | scp2/source/base/module_base.scp | 7 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 |
7 files changed, 25 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index b8f953e43b63..ddbb17c62417 100644 --- a/Repository.mk +++ b/Repository.mk @@ -210,6 +210,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \ + abp \ + dbp \ + dbu \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ svgfilter \ flash \ @@ -376,7 +382,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - abp \ acc \ adabas \ adabasui \ @@ -395,8 +400,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ AppleRemote \ avmediaQuickTime \ calc \ - dbp \ - dbu \ filtertracer \ log \ MacOSXSpell \ diff --git a/scp2/AutoInstallLibs_base.mk b/scp2/AutoInstallLibs_base.mk new file mode 100644 index 000000000000..5cb70c28f4d6 --- /dev/null +++ b/scp2/AutoInstallLibs_base.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index e3609f4f8ce1..d9561421fd45 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base)) + # Not sure about that? #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\ # ENABLE_REPORTBUILDER \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 3178920ea7c2..ce1fb02782f5 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_base \ AutoInstallLibs_onlineupdate \ AutoInstallLibs_graphicfilter \ AutoInstallLibs_tde \ diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index f4eaad99246b..c11105662188 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -36,13 +36,10 @@ File gid_File_Exe_Odbcconfig End #endif -STD_LIB_FILE( gid_File_Lib_Abp, abp) STD_RES_FILE( gid_File_Res_Abp, abp) -STD_LIB_FILE( gid_File_Lib_Dbp, dbp) STD_RES_FILE( gid_File_Res_Dbp, dbp) -STD_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) STD_RES_FILE( gid_File_Res_Cnr, cnr) diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index ce28fae9879b..615cbddedf5f 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstallLibs/base" + Module gid_Module_Prg_Base MOD_NAME_DESC(MODULE_PRG_BASE); ParentID = gid_Module_Prg; @@ -33,11 +35,8 @@ Module gid_Module_Prg_Base_Bin Minimal = NO; Default = YES; Styles = (HIDDEN_ROOT); - Files = ( + Files = (auto_Base_Lib_ALL gid_File_Share_Registry_Base_Xcd - ,gid_File_Lib_Abp - ,gid_File_Lib_Dbp - ,gid_File_Lib_Dbu ); End diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index db3a859f7287..530524c6da37 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -109,7 +109,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER +gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE |