diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am index b3e5cec1cc..bf31bfede3 100644 --- a/src/business/business-gnome/Makefile.am +++ b/src/business/business-gnome/Makefile.am @@ -74,7 +74,7 @@ libgncmod_business_gnome_la_LIBADD = \ ${top_builddir}/src/register/register-core/libgnc-register-core.la \ ${top_builddir}/src/register/register-gnome/libgnc-register-gnome.la \ ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \ - ${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \ + ${top_builddir}/src/gnome-search/libgnc-gnome-search.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ diff --git a/src/business/business-gnome/business-gnome.scm b/src/business/business-gnome/business-gnome.scm index b8abe6cf12..55a1807915 100644 --- a/src/business/business-gnome/business-gnome.scm +++ b/src/business/business-gnome/business-gnome.scm @@ -4,7 +4,6 @@ (gnc:module-load "gnucash/gnome-utils" 0) (gnc:module-load "gnucash/business-core" 0) (gnc:module-load "gnucash/business-utils" 0) -(gnc:module-load "gnucash/gnome-search" 0) (gnc:module-load "gnucash/business-core-file" 0) (gnc:module-load "gnucash/dialog-tax-table" 0) diff --git a/src/business/business-gnome/gncmod-business-gnome.c b/src/business/business-gnome/gncmod-business-gnome.c index 537ebb093f..ddf6c5c53f 100644 --- a/src/business/business-gnome/gncmod-business-gnome.c +++ b/src/business/business-gnome/gncmod-business-gnome.c @@ -77,16 +77,13 @@ gnc_module_init(int refcount) if (!gnc_module_load ("gnucash/business-core", 0)) { return FALSE; } - /* We also depend on app-utils, gnome-utils, and gnome-search modules */ + /* We also depend on app-utils, and gnome-utils modules */ if (!gnc_module_load ("gnucash/app-utils", 0)) { return FALSE; } if (!gnc_module_load ("gnucash/gnome-utils", 0)) { return FALSE; } - if (!gnc_module_load ("gnucash/gnome-search", 0)) { - return FALSE; - } if (!gnc_module_load ("gnucash/report/report-gnome", 0)) { return FALSE; } diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am index e70ea43f64..b4c6d0fd45 100644 --- a/src/gnome-search/Makefile.am +++ b/src/gnome-search/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libgncmod-gnome-search.la +pkglib_LTLIBRARIES = libgnc-gnome-search.la AM_CFLAGS = \ -I${top_srcdir}/src \ @@ -17,8 +17,7 @@ AM_CFLAGS = \ ${QOF_CFLAGS} \ ${GNOME_PRINT_CFLAGS} -libgncmod_gnome_search_la_SOURCES = \ - gncmod-gnome-search.c \ +libgnc_gnome_search_la_SOURCES = \ gnc-general-search.c \ dialog-search.c \ search-account.c \ @@ -49,9 +48,9 @@ noinst_HEADERS = \ search-reconciled.h \ search-string.h -libgncmod_gnome_search_la_LDFLAGS = -avoid-version +libgnc_gnome_search_la_LDFLAGS = -avoid-version -libgncmod_gnome_search_la_LIBADD = \ +libgnc_gnome_search_la_LIBADD = \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ diff --git a/src/gnome-search/gncmod-gnome-search.c b/src/gnome-search/gncmod-gnome-search.c deleted file mode 100644 index a3077f91e9..0000000000 --- a/src/gnome-search/gncmod-gnome-search.c +++ /dev/null @@ -1,90 +0,0 @@ -/********************************************************************* - * gncmod-gnome-search - * GNC Module initialization for the Gnome Search UI - * - * Copyright (c) 2002 Derek Atkins - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, contact: - * - * Free Software Foundation Voice: +1-617-542-5942 - * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 - * Boston, MA 02110-1301, USA gnu@gnu.org - *********************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -#include "gnc-module.h" -#include "gnc-module-api.h" - -#include "search-core-type.h" - -/* version of the gnc module system interface we require */ -int gnc_module_system_interface = 0; - -/* module versioning uses libtool semantics. */ -int gnc_module_current = 0; -int gnc_module_revision = 0; -int gnc_module_age = 0; - - -char * -gnc_module_path(void) -{ - return g_strdup("gnucash/gnome-search"); -} - -char * -gnc_module_description(void) -{ - return g_strdup("The GnuCash Gnome Search UI"); -} - -int -gnc_module_init(int refcount) -{ - /* load the engine (we depend on it) */ - if(!gnc_module_load("gnucash/engine", 0)) { - return FALSE; - } - - if (!gnc_module_load("gnucash/gnome-utils", 0)) { - return FALSE; - } - - if(refcount == 0) - { - /* initialize known types */ - gnc_search_core_initialize (); - } - - return TRUE; -} - -int -gnc_module_end(int refcount) { - /* XXX Unload the other modules */ - - if (refcount == 0) { - /* Shutdown */ - gnc_search_core_finalize (); - } - - return TRUE; -} diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index f5514c6815..82cd501fee 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -8,7 +8,7 @@ libgnc_gnome_la_LIBADD = \ ${top_builddir}/src/register/register-core/libgnc-register-core.la \ ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \ ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ - ${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \ + ${top_builddir}/src/gnome-search/libgnc-gnome-search.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \