diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 20:58:18 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:49 +0000 |
| commit | d04ac66578b41345305d620d3eaf6ca7ee83c6c3 (patch) | |
| tree | dea2f895971e97352c7c609b5d571e3f3f05a426 /scp2 | |
| parent | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (diff) | |
dung out berkeleydb gnumake / configure bits ...
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 15 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
4 files changed, 0 insertions, 24 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 58168619b436..d41db04bb3d0 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -51,7 +51,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_CAIRO \ SYSTEM_CLUCENE \ SYSTEM_CURL \ - SYSTEM_DB \ SYSTEM_EXPAT \ SYSTEM_GRAPHITE \ SYSTEM_HSQLDB \ @@ -89,7 +88,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ MINGW_CAIRO_DLL \ MINGW_CRYPTO_DLL \ MINGW_CURL_DLL \ - MINGW_DB_DLL \ MINGW_EXPAT_DLL \ MINGW_FONTCONFIG_DLL \ MINGW_FREETYPE_DLL \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 9df93a85598f..27c47f9ca637 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -199,21 +199,6 @@ End #endif -#ifndef SYSTEM_DB - -File gid_File_Lib_Db - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX)); - #else - Name = "libdb47.dll"; - #endif -End - -#endif - #ifdef UNX #ifdef ENABLE_GTK #ifdef ENABLE_SYSTRAY_GTK diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 17d1139cb003..7a3b0933fc7d 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -67,12 +67,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, MINGW_LIBXML_DLL ) #endif #endif -#ifdef SYSTEM_DB -#ifdef NEEDS_MINGW_DB_DLL -MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL ) -#endif -#endif - #if defined SYSTEM_CURL || defined SYSTEM_NSS #ifdef NEEDS_MINGW_NSPR4_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index fce582120e88..5a3acccf2b9e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -323,7 +323,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Comphelper2, gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, - gid_File_Lib_Db, gid_File_Lib_Dbpool, gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, |