Repository.mk | 6 ++++-- scp2/source/canvas/mtfrenderer.scp | 12 +----------- scp2/source/impress/module_ogltrans.scp | 12 ++---------- 3 files changed, 7 insertions(+), 23 deletions(-)
New commits: commit 1cfaf70d401d49ab5a2c353f256203e086a678dc Author: Bjoern Michaelsen <[email protected]> Date: Fri Feb 15 14:11:28 2013 +0100 proposal: move towards killing UNOLIBS_OOO and merge libs to OOOLIBS - this is a partial example commit moving ogltrans and mtfrenderer to OOOLIBS - this renames the libs universally as gbuild is making this trivial and little risk of having libs linking against the old name - having libs named differently (lib*.uno.so and lib*lo.so) just adds needles complexity to the build system and creates insecurity for new contributors (and is not really documented either) - we should probably look at the other lib groups for cheap kills too (renaming in stable/frozen URE isnt worth it though) Change-Id: I2106dd2afb71861acf3de7d21a2283473ea2110c Reviewed-on: https://gerrit.libreoffice.org/2169 Reviewed-by: David Ostrovsky <[email protected]> Tested-by: David Ostrovsky <[email protected]> diff --git a/Repository.mk b/Repository.mk index cb034f0..cf5193c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,6 +559,10 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ salhelper \ )) +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + mtfrenderer \ + OGLTrans \ +)) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ basprov \ @@ -589,9 +593,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ migrationoo2 \ migrationoo3 \ msforms \ - mtfrenderer \ nullcanvas \ - OGLTrans \ passwordcontainer \ pdfimport \ pythonloader \ diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp index da372b2..f8137c7 100644 --- a/scp2/source/canvas/mtfrenderer.scp +++ b/scp2/source/canvas/mtfrenderer.scp @@ -27,14 +27,4 @@ #include "macros.inc" -File gid_File_Lib_MtfRenderer - LIB_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(mtfrenderer.uno,UNXSUFFIX)); - #else - Name = "mtfrenderer.uno.dll"; - #endif -End +STD_LIB_FILE(gid_File_Lib_MtfRenderer, mtfrenderer) diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 409ff9b..ade2e74 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -36,16 +36,8 @@ Module gid_Module_Optional_OGLTrans Default = NO; End -File gid_File_Lib_OpenGLTransitions - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX)); - #else - Name = "OGLTrans.uno.dll"; - #endif -End + +STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans) File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml TXT_FILE_BODY; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
