r15664 - gnucash/branches/module-cleanup/src - de-modulify gnucash/calculation

Peter McAlpine prock at cvs.gnucash.org
Sun Feb 25 17:11:24 EST 2007 

Author: prock
Date: 2007-02-25 17:11:23 -0500 (Sun, 25 Feb 2007)
New Revision: 15664
Trac: http://svn.gnucash.org/trac/changeset/15664

Removed:
   gnucash/branches/module-cleanup/src/calculation/gncmod-calculation.c
Modified:
   gnucash/branches/module-cleanup/src/app-utils/Makefile.am
   gnucash/branches/module-cleanup/src/app-utils/gncmod-app-utils.c
   gnucash/branches/module-cleanup/src/bin/Makefile.am
   gnucash/branches/module-cleanup/src/bin/gnucash-bin.c
   gnucash/branches/module-cleanup/src/calculation/Makefile.am
   gnucash/branches/module-cleanup/src/calculation/test/Makefile.am
   gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am
   gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c
   gnucash/branches/module-cleanup/src/gnome/Makefile.am
   gnucash/branches/module-cleanup/src/import-export/binary-import/Makefile.am
Log:
de-modulify gnucash/calculation

Modified: gnucash/branches/module-cleanup/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/app-utils/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/app-utils/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -72,7 +72,7 @@
 libgncmod_app_utils_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgnc-calculation.la \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GCONF_LIBS} \
   ${GTK_LIBS} \

Modified: gnucash/branches/module-cleanup/src/app-utils/gncmod-app-utils.c
===================================================================
--- gnucash/branches/module-cleanup/src/app-utils/gncmod-app-utils.c	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/app-utils/gncmod-app-utils.c	2007-02-25 22:11:23 UTC (rev 15664)
@@ -61,11 +61,6 @@
     return FALSE;
   }
 
-  /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/calculation", 0)) {
-    return FALSE;
-  }
-
   scm_init_sw_app_utils_module();
   /* publish swig bindings */
   /* load the scheme code */

Modified: gnucash/branches/module-cleanup/src/bin/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/bin/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/bin/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -16,6 +16,7 @@
   -I${top_srcdir}/src/gnome \
   -I${top_builddir}/src/gnome-utils \
   -I${top_srcdir}/src/register/register-gnome \
+  -I${top_srcdir}/src/gnome-search \
   -I${top_srcdir}/src/gnc-module
 
 bin_PROGRAMS = gnucash-bin

Modified: gnucash/branches/module-cleanup/src/bin/gnucash-bin.c
===================================================================
--- gnucash/branches/module-cleanup/src/bin/gnucash-bin.c	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/bin/gnucash-bin.c	2007-02-25 22:11:23 UTC (rev 15664)
@@ -53,6 +53,7 @@
 #include "gnc-session.h"
 #include "engine-helpers.h"
 #include "swig-runtime.h"
+#include "search-core-type.h"
 
 #ifdef HAVE_GETTEXT
 #  include <libintl.h>
@@ -347,6 +348,10 @@
         g_error("Gnucash gnome register failed to initialize");
     }
 
+    /* gnucash/gnome-search */
+    gnc_search_core_initialize();
+    gnc_hook_add_dangler(HOOK_SHUTDOWN, (GFunc)gnc_search_core_finalize, NULL);
+
     if (!gnc_engine_is_initialized()) {
         /* On Windows this check used to fail anyway, see
 	   https://lists.gnucash.org/pipermail/gnucash-devel/2006-September/018529.html

Modified: gnucash/branches/module-cleanup/src/calculation/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/calculation/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/calculation/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -1,17 +1,16 @@
 SUBDIRS = . test
 
-pkglib_LTLIBRARIES = libgncmod-calculation.la
+pkglib_LTLIBRARIES = libgnc-calculation.la
 
-libgncmod_calculation_la_LDFLAGS = -avoid-version
+libgnc_calculation_la_LDFLAGS = -avoid-version
 
-libgncmod_calculation_la_LIBADD = \
+libgnc_calculation_la_LIBADD = \
   ${GLIB_LIBS} ${GUILE_LIBS} \
   ${QOF_LIBS}
 
-libgncmod_calculation_la_SOURCES = \
+libgnc_calculation_la_SOURCES = \
   expression_parser.c \
-  fin.c \
-  gncmod-calculation.c
+  fin.c
 
 noinst_HEADERS = \
   finvar.h \
@@ -31,7 +30,6 @@
 AM_CFLAGS = \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}

Deleted: gnucash/branches/module-cleanup/src/calculation/gncmod-calculation.c
===================================================================
--- gnucash/branches/module-cleanup/src/calculation/gncmod-calculation.c	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/calculation/gncmod-calculation.c	2007-02-25 22:11:23 UTC (rev 15664)
@@ -1,41 +0,0 @@
-/*********************************************************************
- * gncmod-calculation.c
- * module definition/initialization for the calculation module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-
-#include <stdio.h>
-#include <gmodule.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.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/calculation");
-}
-
-char *
-gnc_module_description(void) {
-  return g_strdup("GnuCash calculation module");
-}
-
-int
-gnc_module_init(int refcount) {
-  return TRUE;
-}
-
-int
-gnc_module_end(int refcount) {
-  return TRUE;
-}

Modified: gnucash/branches/module-cleanup/src/calculation/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/calculation/test/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/calculation/test/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -4,6 +4,6 @@
 
 test_link_SOURCES=test-link.c
 test_link_LDADD= \
-  ../libgncmod-calculation.la \
+  ../libgnc-calculation.la \
   ${GLIB_LIBS} \
   -lgmodule-2.0

Modified: gnucash/branches/module-cleanup/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/gnome/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/gnome/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -13,7 +13,7 @@
   ${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgnc-calculation.la \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}

Modified: gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -175,7 +175,7 @@
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
-  ${top_builddir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgnc-calculation.la \
   ${top_builddir}/src/network-utils/libgncmod-network-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   $(top_builddir)/lib/libc/libc-missing.la \

Modified: gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c	2007-02-25 22:11:23 UTC (rev 15664)
@@ -60,11 +60,6 @@
   }
 
   /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/calculation", 0)) {
-    return FALSE;
-  }
-
-  /* load the calculation module (we depend on it) */
   if(!gnc_module_load("gnucash/network-utils", 0)) {
     return FALSE;
   }

Modified: gnucash/branches/module-cleanup/src/import-export/binary-import/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/import-export/binary-import/Makefile.am	2007-02-25 21:54:56 UTC (rev 15663)
+++ gnucash/branches/module-cleanup/src/import-export/binary-import/Makefile.am	2007-02-25 22:11:23 UTC (rev 15664)
@@ -30,7 +30,7 @@
 libgncmod_binary_import_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgnc-calculation.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${GUILE_LIBS} \

More information about the gnucash-changes mailing list