Remove the separate "calculation" module and swallow it in app-utils.

Those few source files do not justify an extra loadable module. They are
just compiled-in into app-utils.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22075 57a11ea4-9604-0410-9ed3-97b8803252fd

configure.ac

@@ -1242,8 +1242,6 @@ AC_CONFIG_FILES(
   src/bin/test/Makefile
   src/core-utils/Makefile
   src/core-utils/test/Makefile
-  src/calculation/Makefile
-  src/calculation/test/Makefile
   src/debug/Makefile
   src/debug/valgrind/Makefile
   src/doc/Makefile

src/Makefile.am

@@ -11,7 +11,6 @@ NONGUI_SUBDIRS = \
   backend \
   scm \
   quotes \
-  calculation \
   tax
 
 # These directories should also not contain any gtk dependencies, but

src/app-utils/Makefile.am

@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/calculation \
+  -I${top_srcdir}/src/app-utils/calculation \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/libqof/qof \
@@ -35,6 +35,8 @@ AM_CPPFLAGS = \
   ${GTK_CFLAGS}
 
 libgncmod_app_utils_la_SOURCES = \
+  calculation/expression_parser.c \
+  calculation/fin.c \
   swig-app-utils-guile.c \
   business-options.c \
   QuickFill.c \
@@ -84,7 +86,6 @@ libgncmod_app_utils_la_LDFLAGS = -avoid-version
 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/core-utils/libgnc-core-utils.la \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GCONF_LIBS} \
@@ -133,6 +134,12 @@ gncscm_DATA = \
 
 noinst_DATA = .scm-links
 
+noinst_HEADERS = \
+  calculation/finvar.h \
+  calculation/finproto.h \
+  calculation/fin_spl_protos.h \
+  calculation/fin_static_proto.h
+
 EXTRA_DIST = \
   swig-app-utils-python.c \
   app-utils.i \

src/app-utils/gncmod-app-utils.c

@@ -66,12 +66,6 @@ libgncmod_app_utils_gnc_module_init(int refcount)
         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 */

src/app-utils/test/Makefile.am

@@ -13,7 +13,6 @@ test_print_parse_amount_SOURCES = \
   test-print-parse-amount.c
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
@@ -26,7 +25,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/backend/xml \
   --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils
 
 TESTS_ENVIRONMENT = \

src/calculation/CMakeLists.txt

@@ -1,32 +0,0 @@
-# CMakeLists.txt for src/calculation
-
-INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/lib/libc) # for pow.h
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/gnc-module) # for gnc-module.h
-
-SET (calculation_SOURCES
-  expression_parser.c
-  fin.c
-  gncmod-calculation.c
-)
-
-# Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${calculation_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
-
-SET (calculation_HEADERS
-  finvar.h
-  finproto.h
-  fin_spl_protos.h
-  fin_static_proto.h
-)
-
-ADD_LIBRARY	(calculation
-  ${calculation_SOURCES}
-  ${calculation_HEADERS}
-  )

src/calculation/Makefile.am

@@ -1,38 +0,0 @@
-SUBDIRS = . test
-
-pkglib_LTLIBRARIES = libgncmod-calculation.la
-
-libgncmod_calculation_la_LDFLAGS = -avoid-version
-
-libgncmod_calculation_la_LIBADD = \
-  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-  ${GLIB_LIBS} \
-  ${GUILE_LIBS}
-
-libgncmod_calculation_la_SOURCES = \
-  expression_parser.c \
-  fin.c \
-  gncmod-calculation.c
-
-noinst_HEADERS = \
-  finvar.h \
-  finproto.h \
-  fin_spl_protos.h \
-  fin_static_proto.h
-
-EXTRA_DIST = \
-  README \
-  amort_opt.c \
-  amort_prt.c \
-  fin-interactive.c \
-  fin-main.c \
-  numeric_ops.c \
-  numeric_ops.h
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
-  ${GLIB_CFLAGS}

src/calculation/gncmod-calculation.c

@@ -1,47 +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"
-
-GNC_MODULE_API_DECL(libgncmod_calculation)
-
-/* version of the gnc module system interface we require */
-int libgncmod_calculation_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_calculation_gnc_module_current  = 0;
-int libgncmod_calculation_gnc_module_revision = 0;
-int libgncmod_calculation_gnc_module_age      = 0;
-
-
-char *
-libgncmod_calculation_gnc_module_path(void)
-{
-    return g_strdup("gnucash/calculation");
-}
-
-char *
-libgncmod_calculation_gnc_module_description(void)
-{
-    return g_strdup("GnuCash calculation module");
-}
-
-int
-libgncmod_calculation_gnc_module_init(int refcount)
-{
-    return TRUE;
-}
-
-int
-libgncmod_calculation_gnc_module_end(int refcount)
-{
-    return TRUE;
-}

src/calculation/test/Makefile.am

@@ -1,9 +0,0 @@
-TESTS=test-link
-
-check_PROGRAMS=test-link
-
-test_link_SOURCES=test-link.c
-test_link_LDADD= \
-  ../libgncmod-calculation.la \
-  ${GLIB_LIBS} \
-  -lgmodule-2.0

src/calculation/test/test-link.c

@@ -1,6 +0,0 @@
-int
-main(int argc, char ** argv)
-{
-    return 0;
-}
-

src/gnome-utils/gncmod-gnome-utils.c

@@ -59,12 +59,6 @@ libgncmod_gnome_utils_gnc_module_init(int refcount)
         return FALSE;
     }
 
-    /* load the calculation module (we depend on it) */
-    if (!gnc_module_load("gnucash/calculation", 0))
-    {
-        return FALSE;
-    }
-
     if (!gnc_module_load("gnucash/app-utils", 0))
     {
         return FALSE;

src/gnome-utils/test/Makefile.am

@@ -9,7 +9,6 @@ TESTS_GUI = test-gnc-recurrence
 ##lib_LTLIBRARIES = libgncgnome.la
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
@@ -24,7 +23,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/backend/xml \
   --library-dir    ${top_builddir}/src/backend/sql \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils
 
 

src/gnome/Makefile.am

@@ -105,9 +105,9 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/calculation \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/app-utils \
+  -I${top_srcdir}/src/app-utils/calculation \
   -I${top_srcdir}/src/backend/xml \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnome-search \

src/html/Makefile.am

@@ -49,7 +49,6 @@ libgncmod_html_la_LIBADD = \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${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/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   $(top_builddir)/lib/libc/libc-missing.la \

src/html/gncmod-html.c

@@ -59,12 +59,6 @@ libgncmod_html_gnc_module_init( int refcount )
         return FALSE;
     }
 
-    /* load the calculation module (we depend on it) */
-    if ( !gnc_module_load( "gnucash/calculation", 0 ) )
-    {
-        return FALSE;
-    }
-
     if ( !gnc_module_load( "gnucash/app-utils", 0 ) )
     {
         return FALSE;

src/import-export/test/Makefile.am

@@ -25,7 +25,6 @@ TESTS = \
   test-import-parse
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/import-export \
@@ -38,7 +37,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${top_builddir}/src/engine \

src/report/report-gnome/test/Makefile.am

@@ -20,7 +20,6 @@ TESTS = \
   test-load-module
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/html \
@@ -40,7 +39,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
   --library-dir    ${top_builddir}/src/engine \

src/report/report-system/test/Makefile.am

@@ -17,7 +17,6 @@ TESTS = \
   test-load-module
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/html \
@@ -33,7 +32,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${top_builddir}/src/engine \
@@ -52,4 +50,4 @@ check_PROGRAMS = test-link-module
 EXTRA_DIST = test-load-module
 
 testit:
-	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
+	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module

src/report/standard-reports/test/Makefile.am

@@ -1,7 +1,6 @@
 TESTS=test-load-module
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/html \
@@ -21,7 +20,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/backend/xml \
   --library-dir    ${top_builddir}/src/backend/sql \

src/report/stylesheets/test/Makefile.am

@@ -6,7 +6,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/html \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/stylesheets \
-  --gnc-module-dir ${top_builddir}/src/calculation \
 \
   --guile-load-dir ${top_builddir}/src/test-core \
   --guile-load-dir ${top_builddir}/src/gnc-module \
@@ -27,7 +26,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/backend/sql \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/html \
   --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/report/report-gnome

src/report/utility-reports/test/Makefile.am

@@ -1,7 +1,6 @@
 TESTS = test-load-module
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
-  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/html \
@@ -19,7 +18,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/calculation \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${top_builddir}/src/engine \