diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-03 10:09:15 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-06 12:45:46 +0000 |
| commit | d5d7d18d5cbfdc4b96cc705fa9a80525a9f60920 (patch) | |
| tree | 6a06b4c2a955aafd7b14fdccc0b9bfd7f1ec14fc /scp2 | |
| parent | 9fc31b75d6ef201d41e15e9bb0f1a4108b29f802 (diff) | |
fdo#60924: Move some more libs to autoinstallation
Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Reviewed-on: https://gerrit.libreoffice.org/3758
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 37 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 11 |
2 files changed, 1 insertions, 47 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b9155e2d0c6b..2c51db4bfabf 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -310,16 +310,6 @@ End #ifdef UNX -#ifdef ENABLE_KAB -STD_LIB_FILE(gid_File_Lib_Kab_1, kab1) -STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1) -#endif - -#ifdef ENABLE_TDEAB -STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1) -STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1) -#endif - #ifdef MACOSX File gid_File_Lib_Macab_1 LIB_FILE_BODY; @@ -540,13 +530,6 @@ End #endif - -#ifdef SOLAR_JAVA - -STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc) - -#endif - #ifdef SOLAR_JAVA File gid_File_Lib_Hsqldb_2 LIB_FILE_BODY; @@ -674,15 +657,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS) -File gid_File_Lib_Vclplug_Gen - Name = LIBNAME(vclplug_gen); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif - #if defined(UNX) && ! defined(MACOSX) #ifdef ENABLE_GTK File gid_File_Lib_Vclplug_Gtk @@ -794,13 +768,6 @@ End #endif /* WNT && HAVE_WINDOWS_SDK */ -File gid_File_Lib_Res - Name = LIBNAME(res); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End - STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap ) STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax ) @@ -859,8 +826,6 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) -STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) - #if ! defined UNX File gid_File_Lib_Sysdtrans LIB_FILE_BODY; @@ -1071,8 +1036,6 @@ STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 ) STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 ) -STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) - STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed ) #ifndef SYSTEM_OPENSSL diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index dc538fa8e52d..cd0c44f7ac65 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -156,22 +156,18 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Oox, gid_File_Lib_Pl, gid_File_Lib_Sf_Prothdlr, - gid_File_Lib_Res, gid_File_Lib_Spa, gid_File_Lib_AVMediaWin, gid_File_Lib_AVMediaGStreamer, gid_File_Lib_AVMediaGStreamer_0_10, gid_File_Lib_Sysdtrans, - gid_File_Lib_TextConversionDlgs, gid_File_Lib_Acc, gid_File_Lib_BaseBmp, gid_File_Lib_Zip, - gid_File_Lib_Vclplug_Gen, gid_File_Lib_Vclplug_Tde, gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, - gid_File_Lib_Vclplug_Svp, - gid_File_Lib_Guesslang); + gid_File_Lib_Vclplug_Svp); End Module gid_Module_Root_Files_5 @@ -203,10 +199,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Dbpool, gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, - gid_File_Lib_Tdeab_1, - gid_File_Lib_Tdeab_Drv_1, - gid_File_Lib_Kab_1, - gid_File_Lib_Kab_Drv_1, gid_File_Lib_Macab_1, gid_File_Lib_Macab_Drv_1, gid_File_Lib_I18nsearch, @@ -219,7 +211,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Localedata_Euro, gid_File_Lib_Localedata_Others, gid_File_Lib_Hsqldb_2, - gid_File_Lib_Jdbc, gid_File_Lib_Mork, gid_File_Lib_Mozabdrv, gid_File_Lib_Mozbootstrap, |