[Libreoffice-commits] core.git: Repository.mk scp2/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Sat Apr 20 22:53:29 PDT 2013
Repository.mk | 16 ++++++++--------
scp2/source/gnome/file_gnome.scp | 21 +++------------------
scp2/source/impress/file_impress.scp | 11 +----------
scp2/source/kde/file_kde.scp | 14 ++------------
scp2/source/python/file_python.scp | 11 +----------
scp2/source/tde/file_tde.scp | 7 +------
6 files changed, 16 insertions(+), 64 deletions(-)
New commits:
commit 03a36ed0fb81088358d7cfc3068a7be9878f2f8b
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Sat Apr 20 17:46:19 2013 -0300
fdo#60949: Move more libs to OOOLIBS
Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b
Reviewed-on: https://gerrit.libreoffice.org/3511
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 314ca61d..0afc24b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,20 +559,28 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ PresenterScreen \
basprov \
cairocanvas \
dlgprov \
expwrap \
fastsax \
+ gconfbe1 \
i18nsearch \
+ kdebe1 \
+ kde4be1 \
ldapbe2 \
migrationoo2 \
migrationoo3 \
msforms \
mtfrenderer \
OGLTrans \
+ pythonloader \
slideshow \
stringresource \
+ tdebe1 \
+ ucpgio1 \
+ ucpgvfs1 \
vbaevents \
vbaobj \
vbaswobj \
@@ -587,33 +595,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
ucpexpand1 \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- PresenterScreen \
canvasfactory \
cmdmail \
directx5canvas \
directx9canvas \
fpicker \
fps_office \
- gconfbe1 \
gdipluscanvas \
hatchwindowfactory \
- kdebe1 \
- kde4be1 \
losessioninstall \
macbe1 \
nullcanvas \
passwordcontainer \
pdfimport \
- pythonloader \
postgresql-sdbc \
postgresql-sdbc-impl \
simplecanvas \
syssh \
- tdebe1 \
ucpcmis1 \
ucpext \
- ucpgio1 \
- ucpgvfs1 \
ucptdoc1 \
updatefeed \
vclcanvas \
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 9672965..cf9a498 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -27,23 +27,13 @@
#include "macros.inc"
#ifdef ENABLE_GIO
-File gid_File_Lib_GIO
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
#endif
#ifdef ENABLE_GNOMEVFS
-File gid_File_Lib_Gnomevfs
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 )
#endif
#if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
@@ -56,12 +46,7 @@ End
#endif
#ifdef ENABLE_GCONF
-File gid_File_Lib_Gconfbe
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 )
#endif
#ifdef ENABLE_SYSTRAY_GTK
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index f2eebf0..7753335 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -37,16 +37,7 @@ File gid_File_Lib_Animcore
PACKED_LIB_FILE_BODY;
End
-File gid_File_Lib_PresenterScreen
- LIB_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
-#if defined UNX
- Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
-#else
- Name = "PresenterScreen.uno.dll";
-#endif
- Styles = (PACKED);
-End
+STD_LIB_FILE( gid_File_Lib_PresenterScreen, PresenterScreen )
File gid_File_Share_Registry_Impress_Xcd
TXT_FILE_BODY;
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 1614f69..2f0320a 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -27,19 +27,9 @@
#include "macros.inc"
#ifdef ENABLE_KDE
-File gid_File_Lib_Kdebe
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 )
#endif
#ifdef ENABLE_KDE4
-File gid_File_Lib_Kde4be
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 )
#endif
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 614c732..c502986 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -54,16 +54,7 @@ File gid_File_Lib_Pyuno
Styles = (PACKED);
End
-File gid_File_Lib_Pythonloader
- LIB_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- #ifdef UNX
- Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
- #else
- Name = "pythonloader.uno.dll";
- #endif
- Styles = (PACKED);
-End
+STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
File gid_File_Py_Unohelper
TXT_FILE_BODY;
diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp
index 0a767d7..945b0de 100644
--- a/scp2/source/tde/file_tde.scp
+++ b/scp2/source/tde/file_tde.scp
@@ -24,10 +24,5 @@
#include "macros.inc"
#ifdef ENABLE_TDE
-File gid_File_Lib_Tdebe
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));
-End
+STD_LIB_FILE( gid_File_Lib_Tdebe, tdebe1 )
#endif
More information about the Libreoffice-commits
mailing list