scp2: move OGLTrans library to AutoInstall

Change-Id: I5140f4053fbb1add4bc0b1b8cb6cd9772f3ffa28

Repository.mk

@@ -224,6 +224,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
 	smd \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \
+	OGLTrans \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	acc \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
@@ -632,7 +636,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	OGLTrans \
 	postgresql-sdbc \
 	postgresql-sdbc-impl \
 	pythonloader \

scp2/AutoInstall.mk

@@ -19,6 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))

scp2/InstallModule_impress.mk

@@ -9,7 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
 
-$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,\
+	impress \
+	ogltrans \
+))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
 	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \

scp2/source/impress/module_ogltrans.scp

@@ -18,18 +18,17 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/ogltrans"
+
 Module gid_Module_Optional_OGLTrans
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS);
     ParentID = gid_Module_Optional;
-    Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd );
+    Files = ( auto_ogltrans_ALL, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd );
     Minimal = NO;
     Default = NO;
 End
 
-
-STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans)
-
 File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
     TXT_FILE_BODY;
     Styles = (FILELIST,PACKED);