[Libreoffice-commits] core.git: Repository.mk scp2/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Mon May 6 05:46:05 PDT 2013
Repository.mk | 18 ++++++++--------
scp2/source/ooo/file_library_ooo.scp | 37 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 11 ----------
3 files changed, 10 insertions(+), 56 deletions(-)
New commits:
commit d5d7d18d5cbfdc4b96cc705fa9a80525a9f60920
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Fri May 3 10:09:15 2013 -0300
fdo#60924: Move some more libs to autoinstallation
Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Reviewed-on: https://gerrit.libreoffice.org/3758
Reviewed-by: Matúš Kukan <matus.kukan at gmail.com>
Tested-by: Matúš Kukan <matus.kukan at gmail.com>
diff --git a/Repository.mk b/Repository.mk
index 13d7e70..e04e7ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -272,6 +272,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwk \
fwl \
fwm \
+ guesslang \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
hyphen \
@@ -287,6 +288,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ira \
itg \
iti \
+ $(if $(SOLAR_JAVA),jdbc) \
+ $(if $(ENABLE_KAB),kab1) \
+ $(if $(ENABLE_KAB),kabdrv1) \
localebe1 \
lng \
lnth \
@@ -299,6 +303,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
offacc \
pcr \
pdffilter \
+ res \
sax \
sb \
sdbt \
@@ -316,6 +321,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
svx \
svxcore \
sw \
+ $(if $(ENABLE_TDEAB),tdeab1) \
+ $(if $(ENABLE_TDEAB),tdeabdrv1) \
+ textconversiondlgs \
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -325,6 +333,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
utl \
uui \
vcl \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
xmlscript \
xmlfa \
xmlfd \
@@ -371,10 +380,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
filtertracer \
flash \
graphicfilter \
- guesslang \
- jdbc \
- kab1 \
- kabdrv1 \
log \
MacOSXSpell \
mork \
@@ -384,7 +389,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pricing \
protocolhandler \
qstart_gtk \
- res \
rpt \
rptui \
rptxml \
@@ -400,13 +404,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
spell \
sts \
svgfilter \
- tdeab1 \
- tdeabdrv1 \
- textconversiondlgs \
textfd \
updatecheckui \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
- vclplug_gen \
vclplug_gtk \
vclplug_gtk3 \
vclplug_tde \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b9155e2..2c51db4 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 dc538fa..cd0c44f 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,
More information about the Libreoffice-commits
mailing list