diff options
| -rw-r--r-- | Repository.mk | 26 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 28 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 4 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
5 files changed, 15 insertions, 47 deletions
diff --git a/Repository.mk b/Repository.mk index fa771222c794..82f3033a4446 100644 --- a/Repository.mk +++ b/Repository.mk @@ -560,14 +560,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ mtfrenderer \ OGLTrans \ )) + +$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ + configmgr \ + $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ + fsstorage \ + i18npool \ + localebe1 \ +)) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ cairocanvas \ canvasfactory \ cmdmail \ - configmgr \ - desktopbe1 \ directx5canvas \ directx9canvas \ dlgprov \ @@ -575,16 +581,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fastsax \ fpicker \ fps_office \ - fsstorage \ gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ - i18npool \ i18nsearch \ kdebe1 \ kde4be1 \ ldapbe2 \ - localebe1 \ losessioninstall \ macbe1 \ migrationoo2 \ @@ -615,16 +618,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ $(if $(filter $(OS),MACOSX), \ fps_aqua \ ) \ + $(if $(filter $(OS),WNT), \ + oleautobridge \ + smplmail \ + wininetbe1 \ + ) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ - oleautobridge \ - smplmail \ - wininetbe1 \ -)) -endif - $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ acceptor \ binaryurp \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 604bcca44abf..9214f171b28f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -107,8 +107,6 @@ File gid_File_Lib_CLucene End #endif -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) - File gid_File_Lib_Ldapbe2 LIB_FILE_BODY; Styles = (PACKED); @@ -450,16 +448,7 @@ End #endif #if defined UNX && ! defined MACOSX - -File gid_File_Lib_Desktopbe - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); -End - #ifdef ENABLE_TDE -#ifndef MACOSX File gid_File_Bin_TdeFilePicker BIN_FILE_BODY; Styles = (PACKED); @@ -467,10 +456,8 @@ File gid_File_Bin_TdeFilePicker Name = "tdefilepicker"; End #endif -#endif #ifdef ENABLE_KDE -#ifndef MACOSX File gid_File_Bin_KdeFilePicker BIN_FILE_BODY; Styles = (PACKED); @@ -479,7 +466,6 @@ File gid_File_Bin_KdeFilePicker End #endif #endif -#endif #ifdef MACOSX File gid_File_Lib_Fps_Aqua @@ -573,8 +559,6 @@ End #endif -SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) - #ifdef WNT File gid_File_Lib_Ftransl @@ -597,17 +581,6 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory. STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) -File gid_File_Lib_I18npool - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX)); - #else - Name = STRING(CONCAT2(i18npool.uno,.dll)); - #endif -End - File gid_File_Lib_I18nsearch LIB_FILE_BODY; Styles = (PACKED); @@ -1125,7 +1098,6 @@ End #endif SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) -SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) #ifdef WNT SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 1c069d72cdbf..1d8daac6d4f9 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -254,7 +254,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Index_Data, gid_File_Lib_Textconv_Dict, gid_File_Lib_Basprov, - gid_File_Lib_Configmgr, gid_File_Lib_Crypto, gid_File_Lib_Dlgprov, gid_File_Lib_Stringresource, @@ -278,7 +277,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Evtatt, gid_File_Lib_Fileacc, gid_File_Lib_Filterconfig1, - gid_File_Lib_I18npool, gid_File_Lib_I18nsearch, gid_File_Lib_I18nisolang, gid_File_Lib_I18nutil, @@ -312,7 +310,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Srtrs1, gid_File_Lib_Tab, gid_File_Lib_Tab2, - gid_File_Lib_Localebe, gid_File_Lib_Migrationoo2, gid_File_Lib_Migrationoo3, gid_File_Lib_Syssh, @@ -384,7 +381,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Macbe, gid_File_Lib_Fps_Office, gid_File_Lib_Fpicker, - gid_File_Lib_Fsstorage, gid_File_Lib_Hatchwindowfactory, gid_File_Lib_Passwordcontainer, gid_File_Lib_Updatefeed, diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 0b4629935547..8fcd4b40739b 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,shell)) $(eval $(call gb_Module_add_targets,shell,\ - Library_desktopbe \ + $(if $(filter-out MACOSX WNT,$(OS)),Library_desktopbe) \ Library_localebe \ )) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index bf4bd064dc7b..fa5d1508caa6 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -105,7 +105,7 @@ gb_MERGEDLIBS := \ configmgr \ cppcanvas \ deploymentmisc \ - desktopbe1 \ + $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ |