autoinstall more OOOLIBS libraries

Change-Id: I02c86d7ab6814bfcf559af7408e5d0e1eef59666

5 files changed, 26 insertions, 113 deletions

diff --git a/Repository.mk b/Repository.mk
index f77022a5ffc7..4bd7c68c8155 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,23 +232,46 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
     dbmm \
     dbtools \
     dbaxml \
+	deploymentmisc \
+	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
     drawinglayer \
+    editeng \
     $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
 	file \
+	filterconfig \
     for \
     forui \
     frm \
     fwe \
 	fwi \
+    fwk \
     fwl \
 	fwm \
+    $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
     lng \
     $(if $(MERGELIBS),merged) \
-    sdbt \
+    msfilter \
     odbcbase \
+    sax \
+    sb \
+    sdbt \
+    sfx \
+    sot \
+    $(if $(ENABLE_HEADLESS),,spl) \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    tk \
+    tl \
 	$(if $(ENABLE_TELEPATHY),tubes) \
     unordf \
     unoxml \
+    utl \
+    uui \
+    vcl \
+    xmlscript \
+    xo \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -287,9 +310,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     calc \
     dbp \
     dbu \
-    deploymentmisc \
-    desktop_detector \
-    editeng \
     egi \
     eme \
     epb \
@@ -301,14 +321,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     eti \
     evoab \
     exp \
-	filterconfig \
 	filtertracer \
 	flash \
 	flat \
-    fwk \
     graphicfilter \
     guesslang \
-    helplinker \
     hyphen \
 	icd \
 	icg \
@@ -331,7 +348,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     mork \
     mozab2 \
     mozabdrv \
-    msfilter \
 	mysql \
     odfflatxml \
     offacc \
@@ -345,8 +361,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     rpt \
     rptui \
     rptxml \
-    sax \
-    sb \
     sc \
     scd \
     scfilt \
@@ -356,34 +370,22 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sdd \
     sdfilt \
     sdui \
-    sfx \
     simplecm \
     sm \
     smd \
     solver \
-    sot \
     spa \
     spell \
-    spl \
     sts \
     svgfilter \
 	svgio \
-    svl \
-    svt \
-    svx \
-    svxcore \
     sw \
 	tdeab1 \
 	tdeabdrv1 \
     textconversiondlgs \
     textfd \
-    tk \
-    tl \
     updatecheckui \
-    utl \
-    uui \
     vbahelper \
-    vcl \
     vclplug_gen \
     vclplug_gtk \
     vclplug_gtk3 \
@@ -392,10 +394,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     vclplug_kde4 \
     vclplug_svp \
     wpftdraw \
-    xmlscript \
     xmlfa \
     xmlfd \
-    xo \
     xof \
     xsltdlg \
     xsltfilter \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a2e960b68831..c062fd012f08 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_deploymentmisc \
     Library_offacc \
     Library_sofficeapp \
-    Library_spl \
+    $(if $(ENABLE_HEADLESS),,Library_spl) \
     Package_intro \
     UIConfig_deployment \
     Zip_brand \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index bb4c0f2b0ccd..8602c2bb4d68 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -430,8 +430,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
 
-STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
-
 STD_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
@@ -568,17 +566,8 @@ End
 
 #endif
 
-File gid_File_Lib_Fwk
-    Name = LIBNAME(fwk);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
-STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
-
 File gid_File_Lib_I18nsearch
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -806,19 +795,11 @@ SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
 
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
-STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
-
 #if defined ENABLE_NPAPI_FROM_BROWSER
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
 #if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS)
-File gid_File_Lib_Desktop_Detector
-    Name = LIBNAME(desktop_detector);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     LIB_FILE_BODY;
@@ -967,12 +948,8 @@ File gid_File_Lib_Fastsax_Uno
   #endif
 End
 
-STD_LIB_FILE( gid_File_Lib_Sax , sax)
-
 STD_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_LIB_FILE( gid_File_Lib_Sb , sb)
-
 STD_LIB_FILE( gid_File_Lib_Scn, scn)
 
 STD_LIB_FILE( gid_File_Lib_Sd , sd)
@@ -1002,13 +979,6 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
 
-File gid_File_Lib_Sfx
-    Name = LIBNAME(sfx);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_Instooofiltmsi
@@ -1031,8 +1001,6 @@ End
 
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Sot, sot )
-
 #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
 
 File gid_File_Lib_Spa
@@ -1051,25 +1019,13 @@ File gid_File_Lib_Spell
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-#if !defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Spl, spl)
-#endif
-
 #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
-STD_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_LIB_FILE( gid_File_Lib_Svtools, svt )
-
-STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE( gid_File_Lib_Svx, svx)
 STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
-
-STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
 STD_LIB_FILE( gid_File_Lib_Sw , sw)
 
@@ -1092,11 +1048,8 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
 STD_LIB_FILE( gid_File_Lib_Acc, acc )
 
-STD_LIB_FILE( gid_File_Lib_Tools, tl )
-
 File gid_File_Lib_Tvhlp1
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -1197,29 +1150,8 @@ File gid_File_Lib_Hyph
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_LIB_FILE( gid_File_Lib_Utl , utl)
-
-STD_LIB_FILE( gid_File_Lib_Uui, uui )
-
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
-
-File gid_File_Lib_Vcl
-    Name = LIBNAME(vcl);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Xcr, xmlscript)
 STD_LIB_FILE( gid_File_Lib_Xof, xof)
-
-File gid_File_Lib_Xo
-    Name = LIBNAME(xo);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
 STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
 STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
 STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 2db76d5ef826..afa4b9d1e59d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -181,10 +181,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Filter_Itg,
 	gid_File_Filter_Iti,
 	gid_File_Lib_Bib,
-	gid_File_Lib_Editeng,
 	gid_File_Lib_Flat,
-	gid_File_Lib_Fwk,
-	gid_File_Lib_Helplinker,
 	gid_File_Lib_J,
 	gid_File_Lib_Offacc,
 	gid_File_Lib_Oox,
@@ -193,19 +190,11 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Pl,
 	gid_File_Lib_Sf_Prothdlr,
 	gid_File_Lib_Res,
-	gid_File_Lib_Sax,
-	gid_File_Lib_Sb,
 	gid_File_Lib_Scn,
 	gid_File_Lib_Sd,
 	gid_File_Lib_Sdd,
 	gid_File_Lib_Sdui,
-	gid_File_Lib_Sfx,
-	gid_File_Lib_Sot,
 	gid_File_Lib_Spa,
-	gid_File_Lib_Spl,
-	gid_File_Lib_Svl,
-	gid_File_Lib_Svtools,
-	gid_File_Lib_Svx,
 	gid_File_Lib_AVMediaWin,
 	gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_AVMediaGStreamer_0_10,
@@ -213,17 +202,10 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
 	gid_File_Lib_TextConversionDlgs,
-	gid_File_Lib_Tk,
 	gid_File_Lib_Acc,
 	gid_File_Lib_BaseBmp,
-	gid_File_Lib_Tools,
-	gid_File_Lib_Utl,
-	gid_File_Lib_Uui,
-	gid_File_Lib_Vcl,
-	gid_File_Lib_Xcr,
 	gid_File_Lib_Xmlfa,
 	gid_File_Lib_Xmlfd,
-	gid_File_Lib_Xo,
 	gid_File_Lib_Xof,
 	gid_File_Lib_Xsltdlg,
 	gid_File_Lib_Xsltfilter,
@@ -274,7 +256,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
-	gid_File_Lib_Filterconfig1,
 	gid_File_Lib_I18nsearch,
     gid_File_Lib_I18nisolang,
 	gid_File_Lib_Icudata,
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index fa5d1508caa6..21c7f2dc5677 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -127,7 +127,7 @@ gb_MERGEDLIBS := \
 	sfx \
 	sofficeapp \
 	sot \
-	spl \
+	$(if $(ENABLE_HEADLESS),,spl) \
 	svl \
 	svt \
 	svx \