diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-04-20 17:46:19 -0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-21 05:53:10 +0000 |
| commit | 03a36ed0fb81088358d7cfc3068a7be9878f2f8b (patch) | |
| tree | 36c389dee1a3643290c015cc76f56e300a8311d5 /scp2 | |
| parent | 8f4fc74c34df6efd6b74aacc610bf6f52b615aa5 (diff) | |
fdo#60949: Move more libs to OOOLIBS
Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b
Reviewed-on: https://gerrit.libreoffice.org/3511
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 21 | ||||
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 11 | ||||
| -rw-r--r-- | scp2/source/kde/file_kde.scp | 14 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 11 | ||||
| -rw-r--r-- | scp2/source/tde/file_tde.scp | 7 |
5 files changed, 8 insertions, 56 deletions
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9672965b589b..cf9a4980a6f2 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 f2eebf041ba6..775333532866 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 1614f69ec235..2f0320a84c54 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 614c732c1452..c5029863f1fa 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 0a767d727f7e..945b0de29823 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 |