diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-17 11:55:28 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-23 14:18:50 +0200 |
commit | 6b436a159be35ecaa81114968512e33952226b3e (patch) | |
tree | c258d7734b2451d56a3b7f7077d87f87fb866e5d /scp2 | |
parent | 2bb103ce8f782b64164078ef4098382e429ef20c (diff) |
kill RTLIBS group; and autoinstall the libraries
This commit changes names for comphelper i18nlangtag and ucbhelper.
Change-Id: I93731ef31f894854f9c642d3adee41006552e303
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 32 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
2 files changed, 0 insertions, 35 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 17f4668f78bf..1677e01cd8e2 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -141,18 +141,6 @@ End SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) #endif - -File gid_File_Lib_Comphelper2 - LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(comphelp,COMID,.dll)); - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); -End - #ifndef SYSTEM_CURL File gid_File_Lib_Curl @@ -498,15 +486,6 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory. STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch ) -File gid_File_Lib_I18nisolang - #ifdef UNX - Name = STRING(CONCAT3(libi18nlangtag,COMID,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(i18nlangtag,COMID,.dll)); - #endif - PACKED_LIB_FILE_BODY; -End - #ifndef SYSTEM_ICU File gid_File_Lib_Icudata @@ -956,17 +935,6 @@ File gid_File_Lib_Tvhlp1 #endif End -File gid_File_Lib_Ucbhelper - LIB_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); - #ifdef UNX - Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(ucbhelper4,COMID,.dll)); - #endif -End - File gid_File_Lib_Ucpchelp1 LIB_FILE_BODY; #ifdef UNX diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 98610d708c98..ec90a1318459 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -243,7 +243,6 @@ Module gid_Module_Root_Files_5 #if ! defined SYSTEM_CLUCENE gid_File_Lib_CLucene, #endif - gid_File_Lib_Comphelper2, gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, gid_File_Lib_Dbpool, @@ -257,7 +256,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Macab_Drv_1, gid_File_Lib_Evtatt, gid_File_Lib_I18nsearch, - gid_File_Lib_I18nisolang, gid_File_Lib_Icudata, gid_File_Lib_Icui18n, gid_File_Lib_Icule, @@ -309,7 +307,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ssl3, gid_File_Lib_Sndfile, gid_File_Lib_Tvhlp1, - gid_File_Lib_Ucbhelper, gid_File_Lib_Ucpchelp1, gid_File_Lib_Ucpdav1, gid_File_Lib_Neon, |