fdo#60924: autoinstall more libraries

This autoinstall thing is quite cool because we don't need #ifdefs in
scp2. Conditions in Repository.mk are enough.

Change-Id: I31525a7e1d3bf0e4484f838483a829490621a241

4 files changed, 8 insertions, 32 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 839e88557461..3390f45b75e7 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_OPENGL \
 	ENABLE_TDE \
 	ENABLE_TDEAB \
-	ENABLE_TELEPATHY \
 	MERGELIBS \
 	SYSTEM_APACHE_COMMONS \
 	SYSTEM_BOOST \
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index cd2dc9c2d6ea..f390a9ed550f 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,8 +27,5 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
-STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ea3a7d9efb12..edb44674d174 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1118,10 +1118,6 @@ STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
 STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
-#ifdef MERGELIBS
-STD_LIB_FILE( gid_File_Lib_Merged, merged )
-#endif
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     LIB_FILE_BODY;
@@ -1331,12 +1327,6 @@ File gid_File_Lib_eXslt
 End
 #endif
 
-
-STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
-
-// AVMedia
-STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
-
 #if defined ENABLE_GSTREAMER
 SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
 #endif
@@ -1553,11 +1543,6 @@ File gid_File_Lib_Rdf
 End
 #endif // SYSTEM_REDLAND
 
-STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
-
-STD_LIB_FILE( gid_File_Lib_For, for)
-STD_LIB_FILE( gid_File_Lib_Forui, forui)
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
@@ -1568,8 +1553,3 @@ File gid_File_Lib_sellangmsi
 End
 
 #endif
-
-#ifdef ENABLE_TELEPATHY
-STD_LIB_FILE( gid_File_Lib_Tubes , tubes)
-#endif
-
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7b661765af35..3004622e5dce 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -196,8 +196,8 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_drawinglayer_auto_installed,
 	gid_File_Lib_Editeng,
 	gid_File_Lib_Flat,
-	gid_File_Lib_For,
-	gid_File_Lib_Forui,
+	gid_File_Lib_for_auto_installed,
+	gid_File_Lib_forui_auto_installed,
 	gid_File_Lib_frm_auto_installed,
 	gid_File_Lib_fwe_auto_installed,
 	gid_File_Lib_fwi_auto_installed,
@@ -226,12 +226,12 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svl,
 	gid_File_Lib_Svtools,
 	gid_File_Lib_Svx,
-	gid_File_Lib_AVMedia,
+	gid_File_Lib_avmedia_auto_installed,
 	gid_File_Lib_AVMediaWin,
 	gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_AVMediaGStreamer_0_10,
 	gid_File_Lib_BaseGfx,
-	gid_File_Lib_Merged,
+	gid_File_Lib_merged_auto_installed,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
 	gid_File_Lib_TextConversionDlgs,
@@ -256,8 +256,8 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Vclplug_Kde,
 	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
-	gid_File_Lib_CanvasTools,
-	gid_File_Lib_CppCanvas,
+	gid_File_Lib_canvastools_auto_installed,
+	gid_File_Lib_cppcanvas_auto_installed,
 	gid_File_Lib_fwm_auto_installed,
 	gid_File_Lib_Guesslang);
 End
@@ -336,7 +336,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Srtrs1,
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
-	gid_File_Lib_Unoxml,
+    gid_File_Lib_unoxml_auto_installed,
 	gid_File_Lib_Localebe,
 	gid_File_Lib_Migrationoo2,
 	gid_File_Lib_Migrationoo3,
@@ -361,7 +361,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Smime3,
 	gid_File_Lib_Sqlite3,
 	gid_File_Lib_Ssl3,
-	gid_File_Lib_Unordf,
+    gid_File_Lib_unordf_auto_installed,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
 	gid_File_Lib_Ucb1,