diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 19:55:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:16 +0200 |
| commit | 53fd7e8690fa5c545da674d562da7ea8f2b686c0 (patch) | |
| tree | 5e9928d2b7bacc5e5e0fe5ddcbdb2f07801e294c | |
| parent | 31d3a4d96fbe4fa22dd873e36e5f415dbf45960e (diff) | |
scp2: move OGLTrans library to AutoInstall
Change-Id: I5140f4053fbb1add4bc0b1b8cb6cd9772f3ffa28
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_impress.mk | 5 | ||||
| -rw-r--r-- | scp2/source/impress/module_ogltrans.scp | 7 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 835b0b31190b..ddf9a96c5a39 100644 --- a/Repository.mk +++ b/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 \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 58e155c4cee4..f40e0a4fc22d 100644 --- a/scp2/AutoInstall.mk +++ b/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)) diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index eb1d084ef569..cb88b935e1f3 100644 --- a/scp2/InstallModule_impress.mk +++ b/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 \ diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 49675cd628f7..40fc17b64698 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/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); |