diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-07 12:56:04 -0300 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-05-17 15:25:44 +0000 |
| commit | 33e0e0d843cd9ad0b7e698f9a3273af1ba78aa8c (patch) | |
| tree | c97d9399eb37f46fbd81e983dd3b8b7179531cd1 /scp2 | |
| parent | 7a5bfde13afd98f1a8e110a96a636119da2ad911 (diff) | |
fdo#60924: autoinstall gnome libraries
Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a
Reviewed-on: https://gerrit.libreoffice.org/3813
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_gnome.mk | 9 | ||||
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 23 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 23 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 35 |
4 files changed, 0 insertions, 90 deletions
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 3a8dd517beb8..f631b5799dc3 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -12,22 +12,13 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ - ENABLE_EVOAB2 \ - ENABLE_GCONF \ ENABLE_GIO \ ENABLE_GNOMEVFS \ - ENABLE_GTK \ - ENABLE_GTK3 \ ENABLE_LOCKDOWN \ - ENABLE_SYSTRAY_GTK \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ scp2/source/gnome/file_gnome \ )) -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\ - scp2/source/gnome/module_gnome \ -)) - # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9f824d82ded2..68f413f0dcd8 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -26,16 +26,6 @@ ************************************************************************/ #include "macros.inc" -#ifdef ENABLE_GIO -STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 ) - -STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall) -#endif - -#ifdef ENABLE_GNOMEVFS -STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 ) -#endif - #if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO File gid_File_Share_Registry_Gnome_Xcd TXT_FILE_BODY; @@ -44,16 +34,3 @@ File gid_File_Share_Registry_Gnome_Xcd Name = "gnome.xcd"; End #endif - -#ifdef ENABLE_GCONF -STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) -#endif - -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk - Name = LIBNAME(qstart_gtk); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 13667627759b..9f4d0b829abb 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -39,29 +39,6 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = "SUNWgnome-vfs"; #endif Files = ( -#ifdef ENABLE_EVOAB2 - gid_File_Lib_Evoab, -#endif -#ifdef ENABLE_GTK - gid_File_Lib_Fps_Gnome, - gid_File_Lib_Vclplug_Gtk, -#endif -#ifdef ENABLE_GTK3 - gid_File_Lib_Vclplug_Gtk3, -#endif -#ifdef ENABLE_SYSTRAY_GTK - gid_File_Lib_QStart_Gtk, -#endif -#ifdef ENABLE_GNOMEVFS - gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, -#endif -#ifdef ENABLE_GIO - gid_File_Lib_GIO, - gid_File_Lib_Losessioninstall, -#endif -#ifdef ENABLE_GCONF - gid_File_Lib_Gconfbe, -#endif #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 29cb741a24d0..5cf30dab095b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -163,19 +163,6 @@ End #endif -#ifdef UNX -#ifdef ENABLE_GTK -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk - Name = LIBNAME(qstart_gtk); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif -#endif -#endif - File gid_File_Lib_Dbpool LIB_FILE_BODY; Styles = (PACKED); @@ -325,12 +312,6 @@ File gid_File_Lib_Macab_Drv_1 End #endif // #ifdef MACOSX -#ifdef ENABLE_EVOAB2 - -STD_LIB_FILE( gid_File_Lib_Evoab , evoab) - -#endif // #ifdef ENABLE_EVOAB2 - #endif // #ifdef UNX #ifdef WNT @@ -657,22 +638,6 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif #if defined(UNX) && ! defined(MACOSX) -#ifdef ENABLE_GTK -File gid_File_Lib_Vclplug_Gtk - Name = LIBNAME(vclplug_gtk); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif -#ifdef ENABLE_GTK3 -File gid_File_Lib_Vclplug_Gtk3 - Name = LIBNAME(vclplug_gtk3); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif #ifdef ENABLE_TDE #ifndef MACOSX File gid_File_Lib_Vclplug_Tde |