fdo#60924: Move more libs/packages to autoinstall

Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758

4 files changed, 7 insertions, 49 deletions

diff --git a/Repository.mk b/Repository.mk
index b702ae349c69..79afd37e4f7c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -530,9 +530,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	sdbc2 \
 	sofficeapp \
 	srtrs1 \
+	$(if $(filter $(OS),WNT),sysdtrans) \
 	textconv_dict \
 	ucb1 \
 	ucbhelper \
+	$(if $(DISABLE_NEON),,ucpdav1) \
 	ucpfile1 \
 	ucpftp1 \
 	ucpchelp1 \
@@ -561,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	pyuno \
 	pyuno_wrapper \
-	ucpdav1 \
 	xsec_xmlsec \
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
@@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	regpatchactivex \
 	so_activex \
 	so_activex_x64 \
-	sysdtrans \
 	thidxmsi \
 ))
 endif
@@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	$(if $(SYSTEM_CURL),,curl) \
 	$(if $(SYSTEM_LCMS2),,lcms2) \
 	$(if $(SYSTEM_LIBXSLT),,xslt) \
+	$(if $(SYSTEM_CAIRO),,cairo \
+		$(if $(filter $(OS),WNT),,pixman) \
+	) \
 ))
 
 # External executables
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bb57257b6359..23d5a6a57c21 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -969,7 +969,7 @@ endef
 
 else # !SYSTEM_NEON
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 	neon \
 ))
 
@@ -2218,7 +2218,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 endef
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 	clucene \
 ))
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c1a93042b92f..5aace430d2ac 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,17 +26,6 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifndef SYSTEM_CLUCENE
-File gid_File_Lib_CLucene
-    PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libclucene,UNXSUFFIX));
-  #else
-    Name = "clucene.dll";
-  #endif
-End
-#endif
-
 #if defined _MSC_VER
 
 File gid_File_Lib_Cli_Oootypes_Assembly
@@ -121,21 +110,6 @@ End
 #endif
 #endif
 
-#ifdef NEED_CAIRO
-
-#ifndef WNT
-
-File gid_File_Lib_Pixman
-    LIB_FILE_BODY;
-    Styles = (FILELIST);
-    Dir = FILELIST_DIR;
-    Name = "pixman.filelist";
-End
-
-#endif
-
-#endif
-
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
@@ -190,20 +164,6 @@ End
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
-#if ! defined UNX
-File gid_File_Lib_Sysdtrans
-    PACKED_LIB_FILE_BODY;
-    Name = "sysdtrans.dll";
-End
-#endif
-
-#ifndef DISABLE_NEON
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
- #ifndef SYSTEM_NEON
-   SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
- #endif
-#endif
-
 #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
 //we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
 #ifndef SYSTEM_NSS
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 6f29752aa5a3..0daac7fc4df3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -142,7 +142,6 @@ Module gid_Module_Root_Files_4
 	auto_ooobinarytable_ALL,
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
-	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_BaseBmp,
 	gid_File_Lib_Zip);
 End
@@ -157,9 +156,6 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Lib_Crypto,
-#if ! defined SYSTEM_CLUCENE
-        gid_File_Lib_CLucene,
-#endif
 	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Icudata,
 	gid_File_Lib_Icui18n,
@@ -187,7 +183,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Sqlite3,
 	gid_File_Lib_Ssl3,
 	gid_File_Lib_Sndfile,
-	gid_File_Lib_Ucpdav1,
 	gid_File_Lib_Neon,
 	gid_Unixlink_File_Lib_Xslt,
 	gid_Unixlink_File_Lib_eXslt,