[PATCH] fdo#60949: Move some libs to OOOLIBS

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3476

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3476/1

fdo#60949: Move some libs to OOOLIBS

Compile test only :)

Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1
---
M Repository.mk
M scp2/source/canvas/cairocanvas.scp
M scp2/source/ooo/file_library_ooo.scp
3 files changed, 10 insertions(+), 56 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 15c3481..22e03be 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,8 +559,13 @@
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    cairocanvas \
+    msforms \
     mtfrenderer \
     OGLTrans \
+    vbaevents \
+    vbaobj \
+    vbaswobj \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
@@ -574,7 +579,6 @@
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     PresenterScreen \
     basprov \
-    cairocanvas \
     canvasfactory \
     cmdmail \
     directx5canvas \
@@ -595,7 +599,6 @@
     macbe1 \
     migrationoo2 \
     migrationoo3 \
-    msforms \
     nullcanvas \
     passwordcontainer \
     pdfimport \
@@ -613,9 +616,6 @@
     ucpgvfs1 \
     ucptdoc1 \
     updatefeed \
-    vbaevents \
-    vbaobj \
-    vbaswobj \
     vclcanvas \
     $(if $(filter $(OS),MACOSX), \
         fps_aqua \
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 4b313bc..de5742a 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -27,14 +27,4 @@
 
 #include "macros.inc"
 
-File gid_File_Lib_CairoCanvas
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
-  #else
-    Name = "cairocanvas.uno.dll";
-  #endif
-End
-
+STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5aafd04..a993630 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -55,16 +55,7 @@
   #endif
 End
 
-File gid_File_Lib_Vbaevent
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbaevents,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents)
 
 File gid_File_Lib_Scriptframe
     LIB_FILE_BODY;
@@ -306,38 +297,11 @@
   #endif
 End
 
-File gid_File_Lib_Vbaobj
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbaobj,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj)
 
-File gid_File_Lib_Vbaswobj
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj)
 
-File gid_File_Lib_Vbamsforms
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(msforms,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms)
 
 File gid_File_Lib_Vbahelper
     LIB_FILE_BODY;

-- 
To view, visit https://gerrit.libreoffice.org/3476
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>
Gerrit-Reviewer: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit at libreoffice.org>