Build changes to clean up library cross-dependencies and move to libtool-1.4

syntax.  Also a patched ltmain.sh included with CVS now, so builds are
faster and folks with libtool-1.3.4 installed aren't left in the cold.


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

.cvsignore

@@ -22,7 +22,6 @@ install-sh
 intl
 libtool
 ltconfig
-ltmain.sh
 make-gnucash-patch
 make-gnucash-potfiles
 stamp-h

configure.in

@@ -109,6 +109,10 @@ GNOME_CHECK_GUILE
 GNOME_PRINT_CHECK
 GNOME_XML_CHECK
 
+# gnome-print-check appears tobe sort of b0rked for the time being
+GNOME_PRINT_CFLAGS=`${GNOME_CONFIG} --cflags print`
+
+
 #AC_CHECK_HEADER(libxml/xmlversion.h, [
 #  HAVE_XML_VERSION_HEADER=1
 #  AC_DEFINE(HAVE_XML_VERSION_HEADER)
@@ -687,8 +691,8 @@ GNUCASH_NETWORK_UTILS_LIBS="${GHTTP_LIBS} ${GNOME_LIBDIR} ${GNOME_LIBS} ${GNOMEU
 AC_SUBST(GNUCASH_NETWORK_UTILS_CFLAGS)
 AC_SUBST(GNUCASH_NETWORK_UTILS_LIBS)
 
-GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GUPPI_CFLAGS}"
+GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GUPPI_CFLAGS} ${GDK_PIXBUF_CFLAGS}"
-GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GUPPI_LIBS} -lgncmod-gnome-utils"
+GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GUPPI_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
 
 AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
 AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
@@ -737,6 +741,7 @@ AC_OUTPUT(
           rpm/Makefile
           src/Makefile
           src/app-file/Makefile
+          src/app-file/test/Makefile
           src/app-file/gnome/Makefile
           src/app-utils/Makefile
           src/app-utils/test/Makefile
@@ -750,6 +755,7 @@ AC_OUTPUT(
           src/backend/postgres/test/Makefile
           src/backend/rpc/Makefile
           src/calculation/Makefile 
+          src/calculation/test/Makefile 
           src/doc/Makefile
           src/doc/design/Makefile
           src/doc/xml/Makefile
@@ -780,6 +786,7 @@ AC_OUTPUT(
           src/import-export/binary-import/Makefile
           src/import-export/binary-import/test/Makefile
           src/import-export/qif-import/Makefile
+          src/import-export/qif-import/test/Makefile
           src/import-export/qif-io-core/Makefile
           src/import-export/qif-io-core/test/Makefile
           src/network-utils/Makefile

macros/autogen.sh

@@ -17,15 +17,15 @@ fi
   DIE=1
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+#(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+#  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
+#    echo
-    echo "**Error**: You must have \`libtool' installed to compile Gnome."
+#    echo "**Error**: You must have \`libtool' installed to compile Gnome."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+#    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
-    echo "(or a newer version if it is available)"
+#    echo "(or a newer version if it is available)"
-    DIE=1
+#    DIE=1
-  }
+#  }
-}
+#}
 
 #grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
 #  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
@@ -142,12 +142,12 @@ do
         echo "Running intltoolize ..."
         intltoolize --copy --force --automake
       fi 
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+#      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
+#	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
+#	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+#	  libtoolize --force --copy
-	fi
+#	fi
-      fi
+#      fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude || {
 	echo

po/ChangeLog

@@ -0,0 +1,270 @@
+2001-11-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-07  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-06  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-05  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-05  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-11-01  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-30  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-18  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-18  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-18  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-15  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-15  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-15  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-15  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-15  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-27  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-19  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-09-14  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-09-12  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-09-12  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-09-12  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-09-12  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-09-12  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-27  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-26  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-08  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-08  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-08  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-08-08  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-07-30  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-07-30  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-06-26  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-06-16  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-14  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-13  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+
+2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+	* cat-id-tbl.c: Remove file.
+	* stamp-cat-id: Remove file.
+
+2001-06-04  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-05-27  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-04-17  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.36.
+

src/Makefile.am

@@ -10,13 +10,13 @@ SUBDIRS = \
   tax \
   app-utils \
   gnome-utils \
+  gnome \
   app-file \
   register \
   import-export \
   report \
   experimental \
   guile \
-  gnome \
   scm \
   quotes \
   pixmaps \
@@ -31,19 +31,10 @@ bin_PROGRAMS = gnucash
 # problem with the current version of gwrap, and will go away when
 # that's fixed.
 gnucash_LDADD = \
-  -Lengine -Lengine/.libs \
-  -Lgnc-module -Lgnc-module/.libs \
-  -Lcalculation -Lcalculation/.libs \
-  -Lnetwork-utils -Lnetwork-utils/.libs \
-  -Lapp-utils -Lapp-utils/.libs \
-  -Lapp-file -Lapp-file/.libs \
-  -Lapp-file/gnome -Lapp-file/gnome/.libs \
-  -Lgnome -Lgnome/.libs \
   gnc-module/libgncmodule.la \
   gnome-utils/libgncmod-gnome-utils.la \
   app-utils/libgncmod-app-utils.la \
   app-file/libgncmod-app-file.la \
-  app-file/gnome/libgncmod-app-file-gnome.la \
   engine/libgncmod-engine.la \
   engine/libgw-engine.la \
   engine/libgw-glib.la \

src/app-file/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = . gnome
+SUBDIRS = gnome . test
 
 pkglib_LTLIBRARIES = libgncmod-app-file.la libgw-app-file.la
 
@@ -27,19 +27,19 @@ noinst_HEADERS = gnc-file-p.h
 libgncmod_app_file_la_LDFLAGS = -module
 
 libgncmod_app_file_la_LIBADD = \
-  -L../gnc-module -L../gnc-module/.libs -lgncmodule \
+  ../gnc-module/libgncmodule.la \
-  -L../engine -L../engine/.libs -lgncmod-engine \
+  ../engine/libgncmod-engine.la \
-  -L../calculation -L../calculation/.libs -lgncmod-calculation \
+  ../report/report-system/libgncmod-report-system.la \
-  -L../app-utils -L../app-utils/.libs -lgncmod-app-utils \
+  ../app-utils/libgncmod-app-utils.la \
+  ../calculation/libgncmod-calculation.la \
+  ../gnome-utils/libgncmod-gnome-utils.la \
+  ./gnome/libgnc-app-file-gnome.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
 libgw_app_file_la_SOURCES = gw-app-file.c
 libgw_app_file_la_LDFLAGS = -module
 
-#gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-#gncmod_DATA = app-file.scm 
-
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-app-file-spec.scm gw-app-file.scm
 

src/app-file/gncmod-app-file.c

@@ -12,6 +12,8 @@
 #include <libguile/modules.h>
 
 #include "gnc-file-p.h"
+#include "gnc-file-history.h"
+#include "gnc-file-dialog.h"
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
@@ -24,12 +26,14 @@ int gnc_module_revision = 0;
 int gnc_module_age      = 0;
 
 char *
-gnc_module_path(void) {
+gnc_module_path(void) 
+{
   return g_strdup("gnucash/app-file");
 }
 
 char * 
-gnc_module_description(void) {
+gnc_module_description(void) 
+{
   return g_strdup("Application level file interface");
 }
 
@@ -42,7 +46,8 @@ lmod(char * mn)
 }
 
 int
-gnc_module_init(int refcount) {
+gnc_module_init(int refcount) 
+{
   /* load the engine (we depend on it) */
   if(!gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
@@ -57,6 +62,9 @@ gnc_module_init(int refcount) {
 
   if (refcount == 0)
   {
+    gnc_file_set_handlers (gnc_history_add_file,
+                           gnc_history_get_last,
+                           gnc_file_dialog);    
     gnc_file_init ();
   }
 
@@ -64,6 +72,11 @@ gnc_module_init(int refcount) {
 }
 
 int
-gnc_module_end(int refcount) {
+gnc_module_end(int refcount) 
+{
+  if(refcount == 0) 
+  {
+    gnc_file_set_handlers (NULL, NULL, NULL);
+  }
   return TRUE;
 }

src/app-file/gnome/Makefile.am

@@ -1,63 +1,26 @@
-SUBDIRS = . #test
+pkglib_LTLIBRARIES = libgnc-app-file-gnome.la
-
-pkglib_LTLIBRARIES = libgncmod-app-file-gnome.la libgw-app-file-gnome.la
 
 AM_CFLAGS = \
-  -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/app-file \
+  -I${top_srcdir}/src/app-utils \
+  -I${top_srcdir}/src/engine \
   ${GUILE_INCS} \
   ${G_WRAP_COMPILE_ARGS} \
   ${GLIB_CFLAGS} \
   ${GNOME_INCLUDEDIR}
 
-libgncmod_app_file_gnome_la_SOURCES = \
+libgnc_app_file_gnome_la_SOURCES = \
   gnc-file-dialog.c \
-  gnc-file-history.c \
+  gnc-file-history.c 
-  gncmod-app-file-gnome.c
 
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
   gnc-file-history-gnome.h
 
-libgncmod_app_file_gnome_la_LDFLAGS = -module
+libgnc_app_file_gnome_la_LIBADD = \
-
-libgncmod_app_file_gnome_la_LIBADD = \
-  -L${top_srcdir}/src/gnc-module \
-  -L${top_srcdir}/src/gnc-module/.libs -lgncmodule \
-  -L${top_srcdir}/src/app-file \
-  -L${top_srcdir}/src/app-file/.libs -lgncmod-app-file \
   ${GNOMEUI_LIBS} \
   ${GNOME_LIBDIR} \
-  ${GLIB_LIBS}
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
 
-libgw_app_file_gnome_la_SOURCES = gw-app-file-gnome.c
-libgw_app_file_gnome_la_LDFLAGS = -module
-
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-app-file-gnome-spec.scm gw-app-file-gnome.scm
-
-noinst_DATA = .scm-links
-
-EXTRA_DIST = \
-  ${gwmod_DATA}
-
-.scm-links: 
-	rm -f gnucash g-wrapped
-	ln -sf . gnucash 
-	ln -sf . g-wrapped 
-	touch .scm-links
-
-gw-app-file-gnome.scm gw-app-file-gnome.c gw-app-file-gnome.h: .scm-links gw-app-file-gnome-spec.scm
-	FLAVOR=gnome guile -c \
-	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-	  (set! %load-path (cons \"${PWD}\" %load-path)) \
-	  (set! %load-path (cons \"${top_srcdir}/src/engine\" %load-path)) \
-	  (primitive-load \"./gw-app-file-gnome-spec.scm\") \
-	  (gw:generate-module \"gw-app-file-gnome\")"
-
-BUILT_SOURCES = gw-app-file-gnome.scm gw-app-file-gnome.c gw-app-file-gnome.h
-CLEANFILES = gw-app-file-gnome.scm gw-app-file-gnome.c gw-app-file-gnome.h \
-             gw-app-file-gnome.html gnucash g-wrapped .scm-links

src/app-file/gnome/gncmod-app-file-gnome.c

@@ -1,73 +0,0 @@
-/*********************************************************************
- * gncmod-app-file-gnome.c
- * module definition/initialization app-level gnome file interface
- * 
- * Copyright (c) 2001 Linux Developers Group, Inc. 
- *********************************************************************/
-
-#include <stdio.h>
-#include <guile/gh.h>
-#include <glib.h>
-#include <libguile/strports.h>
-#include <libguile/modules.h>
-
-#include "gnc-file-dialog.h"
-#include "gnc-file-p.h"
-#include "gnc-file-history.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/app-file/gnome");
-}
-
-char * 
-gnc_module_description(void)
-{
-  return g_strdup("Application level file interface for Gnome");
-}
-
-static void
-lmod(char * mn) 
-{
-  char * form = g_strdup_printf("(use-modules %s)\n", mn);
-  gh_eval_str(form);
-  g_free(form);
-}
-
-int
-gnc_module_init(int refcount)
-{
-  /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/app-file", 0)) {
-    return FALSE;
-  }
-
-  lmod ("(g-wrapped gw-app-file-gnome)");
-
-  if (refcount == 0)
-    gnc_file_set_handlers (gnc_history_add_file,
-                           gnc_history_get_last,
-                           gnc_file_dialog);
-
-  return TRUE;
-}
-
-int
-gnc_module_end(int refcount)
-{
-  if (refcount == 0)
-    gnc_file_set_handlers (NULL, NULL, NULL);
-
-  return TRUE;
-}

src/app-file/gw-app-file-spec.scm

@@ -42,7 +42,9 @@
    mod
    (lambda (client-only?)
      (list
-      "#include <gnc-file.h>\n")))
+      "#include <gnc-file.h>\n"
+      "#include <gnc-file-history.h>\n"
+      "#include <gnc-file-dialog.h>\n")))
 
 
   (gw:wrap-function
@@ -69,4 +71,24 @@ if they say 'Yes'. The return is false if the user says 'Cancel'.")
    "gnc_file_open_file"
    '(((<gw:m-chars-caller-owned> gw:const) filename))
    "Open filename.")
+
+  (gw:wrap-function
+   mod
+   'gnc:history-get-last
+   '(<gw:m-chars-callee-owned> gw:const)
+   "gnc_history_get_last"
+   '()
+   "Get the last file opened by the user.")
+
+  (gw:wrap-function
+   mod
+   'gnc:file-selection-dialog
+   '(<gw:m-chars-callee-owned> gw:const)
+   "gnc_file_dialog"
+   '(((<gw:m-chars-caller-owned> gw:const) title)
+     ((<gw:m-chars-caller-owned> gw:const) filter)
+     ((<gw:m-chars-caller-owned> gw:const) default))
+   "Lets the user select a file. Dialog has given title, filter,
+or default name. Either filter, default, or both should be NULL.")
+
   )

src/app-file/test/Makefile.am

@@ -0,0 +1,15 @@
+TESTS=test-link test-load-module 
+
+TESTS_ENVIRONMENT=\
+GNC_MODULE_PATH=${top_srcdir}/src/app-file:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine \
+GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/app-file:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/app-file:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine:${top_srcdir}/src/app-file/gnome
+
+
+noinst_PROGRAMS=test-link
+
+test_link_SOURCES=test-link.c
+test_link_LDADD=../libgncmod-app-file.la 
+
+testit: 
+	${TESTS_ENVIRONMENT} gdb guile

src/app-file/test/test-link.c

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

src/app-file/test/test-load-module

@@ -0,0 +1,11 @@
+#! /bin/sh 
+exec guile -s $0
+!#
+
+(use-modules (gnucash gnc-module))
+(gnc:module-system-init)
+
+(display "  testing app-file module load ... ")
+(gnc:module-load "gnucash/app-file" 0)
+
+(display "  ok\n")

src/app-utils/Makefile.am

@@ -41,9 +41,9 @@ gncinclude_HEADERS = \
 libgncmod_app_utils_la_LDFLAGS = -module
 
 libgncmod_app_utils_la_LIBADD = \
-  -L../gnc-module -L../gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
-  -L../engine -L../engine/.libs -lgncmod-engine \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
-  -L../calculation -L../calculation/.libs -lgncmod-calculation \
+  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 

src/app-utils/test/Makefile.am

@@ -6,22 +6,18 @@ TESTS = \
 
 TESTS_ENVIRONMENT= \
    GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
-   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib:${top_srcdir}/src/scm:${top_srcdir}/src/guile \
+   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib:${top_srcdir}/src/scm:${top_srcdir}/src/gnome \
    LTDL_LIBRARY_PATH=.. \
-   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:..:../.libs:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/scm:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:..:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/calculation:${top_srcdir}/src/scm:${top_srcdir}/src/gnome
 
 LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
    ../../engine/libgncmod-engine.la \
    ../../gnc-module/libgncmodule.la \
    ../libgncmod-app-utils.la \
    ../../engine/libgw-engine.la \
    ${top_srcdir}/src/engine/libgw-glib.la \
    ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
+   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la 
-  -lltdl
 
 noinst_PROGRAMS = \
   test-link-module \

src/backend/file/Makefile.am

@@ -48,5 +48,5 @@ noinst_HEADERS = \
 
 libgncmod_backend_file_la_LDFLAGS = -module
 libgncmod_backend_file_la_LIBADD = \
-   ${GLIB_LIBS} ${GNOME_XML_LIB}  \
+   ${GLIB_LIBS} ${GNOME_XML_LIB} \
-   -L../../engine -L../../engine/.libs -lgncmod-engine
+   ${top_srcdir}/src/engine/libgncmod-engine.la 

src/backend/file/test/Makefile.am

@@ -19,7 +19,7 @@ TESTS_ENVIRONMENT = \
   GNC_MODULE_PATH="${top_srcdir}/src/engine:${top_srcdir}/src/gnc-module:${top_srcdir}/src/backend/file" \
   GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/scm:${top_srcdir}/src/guile" \
   LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/backend/file/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/backend/file:${top_srcdir}/src/guile
 
 noinst_LTLIBRARIES = libgnc-test-file-stuff.la
 
@@ -41,9 +41,7 @@ noinst_PROGRAMS = \
 
 noinst_HEADERS = test-file-stuff.h
 
-LDADD = -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
+LDADD = ${top_srcdir}/src/test-core/libgncmod-test.la \
-        -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-        ${top_srcdir}/src/test-core/libgncmod-test.la \
         ${top_srcdir}/src/gnc-module/libgncmodule.la \
         ${top_srcdir}/src/engine/libgncmod-engine.la \
         ${top_srcdir}/src/engine/libgw-engine.la \

src/backend/net/Makefile.am

@@ -17,4 +17,4 @@ noinst_HEADERS = \
 libgncmod_backend_net_la_LDFLAGS = -module
 libgncmod_backend_net_la_LIBADD = \
    ${GLIB_LIBS}  \
-   -L../../engine -L../../engine/.libs -lgncmod-engine
+   ${top_srcdir}/src/engine/libgncmod-engine.la

src/backend/postgres/Makefile.am

@@ -1,7 +1,12 @@
 SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-backend-postgres.la 
-libgncmod_backend_postgres_la_LDFLAGS =-module -lpq -L../../engine -L../../engine/.libs -lgncmod-engine ${GLIB_LIBS}
+
+libgncmod_backend_postgres_la_LDFLAGS = -module 
+
+libgncmod_backend_postgres_la_LIBADD  =  -lpq  \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${GLIB_LIBS}
 
 libgncmod_backend_postgres_la_SOURCES = \
   PostgresBackend.c \

src/backend/postgres/test/Makefile.am

@@ -7,15 +7,13 @@ TESTS_ENVIRONMENT=\
   GNC_MODULE_PATH=${top_srcdir}/src/engine::${top_srcdir}/src/backend/file:${top_srcdir}/src/backend/postgres:${top_srcdir}/src/guile:${top_srcdir}/src/scm \
   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:..:${top_srcdir}/src/gnc-module \
   LTDL_LIBRARY_PATH=${top_srcdir}/src/gnc-module \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/guile
 
 noinst_PROGRAMS = \
   test-db \
   test-escape
 
-LDADD = -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
+LDADD = ${top_srcdir}/src/test-core/libgncmod-test.la \
-        -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-        ${top_srcdir}/src/test-core/libgncmod-test.la \
         ${top_srcdir}/src/gnc-module/libgncmodule.la \
         ${top_srcdir}/src/engine/libgncmod-engine.la \
         ${top_srcdir}/src/engine/libgncmod-engine.la \

src/calculation/Makefile.am

@@ -1,7 +1,9 @@
+SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-calculation.la
 
 libgncmod_calculation_la_LDFLAGS = -module
+libgncmod_calculation_la_LIBADD = ${GLIB_LIBS} 
 
 libgncmod_calculation_la_SOURCES = \
   expression_parser.c \

src/calculation/test/Makefile.am

@@ -0,0 +1,6 @@
+TESTS=test-link
+
+noinst_PROGRAMS=test-link
+
+test_link_SOURCES=test-link.c
+test_link_LDADD=../libgncmod-calculation.la 

src/calculation/test/test-link.c

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

src/engine/Makefile.am

@@ -1,7 +1,7 @@
 SUBDIRS = . test-core test 
 
 pkglib_LTLIBRARIES = \
-  libgncmod-engine.la libgw-glib.la libgw-engine.la libgw-kvp.la
+ libgw-glib.la libgw-engine.la libgw-kvp.la libgncmod-engine.la 
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GNUCASH_ENGINE_BASE_CFLAGS}
 
@@ -81,7 +81,11 @@ noinst_HEADERS = \
   md5.h
 
 libgncmod_engine_la_LDFLAGS = -module
-libgncmod_engine_la_LIBADD = ${GNUCASH_ENGINE_BASE_LIBS}
+libgncmod_engine_la_LIBADD = ${GNUCASH_ENGINE_BASE_LIBS} \
+ ${top_srcdir}/src/gnc-module/libgncmodule.la \
+ ${top_srcdir}/src/engine/libgw-engine.la \
+ ${top_srcdir}/src/engine/libgw-glib.la \
+ ${top_srcdir}/src/engine/libgw-kvp.la 
 
 libgw_glib_la_SOURCES = gw-glib.c glib-helpers.c
 libgw_glib_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}

src/engine/engine.scm

@@ -1,5 +1,4 @@
 (define-module (gnucash engine))
-(use-modules (gnucash bootstrap) (g-wrapped gw-gnc)) ;; FIXME: delete after we finish modularizing.
 (use-modules (g-wrapped gw-engine))
 (use-modules (g-wrapped gw-runtime))
 

src/engine/test-core/Makefile.am

@@ -9,7 +9,7 @@ LDADD = \
 libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
 libgncmod_test_engine_la_LDFLAGS = -module
 libgncmod_test_engine_la_LIBADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-engine-stuff.h

src/engine/test/Makefile.am

@@ -22,19 +22,20 @@ TESTS = \
   test-load-engine \
   test-create-account \
   test-commodities \
-  test-freq-spec \
   test-group-vs-book \
   test-query \
   test-resolve-file-path \
-  test-scm-query \
   test-split-vs-account  \
   test-transaction-voiding 
 
+#  test-freq-spec 
+#  test-scm-query 
+
 TESTS_ENVIRONMENT = \
   GNC_MODULE_PATH="${top_srcdir}/src/engine" \
-  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:../../gnc-module:${top_srcdir}/src/scm:${top_srcdir}/src/guile" \
+  GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:..:../../gnc-module:${top_srcdir}/src/scm" \
   LTDL_LIBRARY_PATH=../../gnc-module \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:..:../.libs:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:..:${top_srcdir}/src/gnc-module
 
 noinst_PROGRAMS = \
   test-commodities \

src/gnc-module/Makefile.am

@@ -15,7 +15,7 @@ libgncmodule_la_LIBADD = \
 
 libgw_gnc_module_la_SOURCES = gw-gnc-module.c
 libgw_gnc_module_la_DEPENDENCIES = libgncmodule.la
-libgw_gnc_module_la_LDFLAGS = -module -L. -L.libs -lgncmodule
+libgw_gnc_module_la_LDFLAGS = -module 
 libgw_gnc_module_la_LIBADD = \
   ${G_WRAP_LINK_ARGS} \
   ${GLIB_LIBS} \

src/gnc-module/gnc-module.c

@@ -241,8 +241,10 @@ gnc_module_system_modinfo(void)
 GNCModuleInfo * 
 gnc_module_get_info(const char * fullpath) 
 {
-  lt_dlhandle  handle = lt_dlopen(fullpath);
+  lt_dlhandle  handle;
+  printf("gnc-module: (init) lt_dlopen '%s'\n", fullpath);
 
+  handle = lt_dlopen(fullpath);
   if(handle) 
   {
     lt_ptr modsysver   = lt_dlsym(handle, "gnc_module_system_interface");
@@ -441,6 +443,7 @@ gnc_module_load(char * module_name, gint interface)
     GNCModuleInfo * modinfo = gnc_module_locate(module_name, interface);
     lt_dlhandle   handle = NULL;
     
+    printf("gnc-module: (load) dlopen '%s'\n", modinfo->module_filepath);
     if(modinfo && ((handle = lt_dlopen(modinfo->module_filepath)) != NULL)) 
     {
       lt_ptr initfunc = lt_dlsym(handle, "gnc_module_init");

src/gnc-module/test/Makefile.am

@@ -19,10 +19,10 @@ TESTS = \
   test-scm-init 
 
 TESTS_ENVIRONMENT = \
-  GNC_MODULE_PATH=${PWD}/mod-foo:${PWD}/mod-bar:${PWD}/mod-baz:${PWD}/misc-mods \
+  GNC_MODULE_PATH=${PWD}/mod-foo:${PWD}/mod-bar:${PWD}/mod-baz:${PWD}/misc-mods:${top_srcdir}/src/import-export/qif-import \
   GUILE_LOAD_PATH=..:${G_WRAP_MODULE_DIR} \
   LTDL_LIBRARY_PATH=../ \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:mod-foo:mod-foo/.libs:mod-bar:mod-bar/.libs:mod-baz:mod-baz/.libs:..:../.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/app-file:mod-foo:mod-foo/.libs:mod-bar:mod-bar/.libs:mod-baz:mod-baz/.libs:..:../.libs
 
 noinst_PROGRAMS = \
   test-load-c \

src/gnome-utils/Makefile.am

@@ -14,7 +14,9 @@ AM_CFLAGS = \
   ${GLIB_CFLAGS} \
   ${GNOME_PRINT_CFLAGS} \
   ${GNOME_INCLUDEDIR} \
-  ${GTKHTML_CFLAGS}
+  ${GDK_PIXBUF_CFLAGS} \
+  ${GTKHTML_CFLAGS} \
+  ${G_WRAP_COMPILE_ARGS}
 
 libgncmod_gnome_utils_la_SOURCES = \
   cursors.c \
@@ -67,11 +69,11 @@ noinst_HEADERS = \
 libgncmod_gnome_utils_la_LDFLAGS = -module
 
 libgncmod_gnome_utils_la_LIBADD = \
-  -L../gnc-module -L../gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
-  -L../engine -L../engine/.libs -lgncmod-engine \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
-  -L../calculation -L../calculation/.libs -lgncmod-calculation \
+  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
-  -L../network-utils -L../network-utils/.libs -lgncmod-network-utils \
+  ${top_srcdir}/src/network-utils/libgncmod-network-utils.la \
-  -L../app-utils -L../app-utils/.libs -lgncmod-app-utils \
+  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
   ${GNOMEUI_LIBS} \
   ${GNOME_LIBDIR} \
   ${GNOME_PRINT_LIBS} \

src/gnome-utils/gw-gnome-utils-spec.scm

@@ -1,6 +1,7 @@
 (define-module (g-wrapped gw-gnome-utils-spec))
 
 (use-modules (g-wrap))
+(use-modules (g-wrapped gw-glib-spec))
 (use-modules (g-wrapped gw-engine-spec))
 
 (debug-set! maxdepth 100000)
@@ -30,6 +31,7 @@
   
   (gw:module-depends-on mod "gw-runtime")
   (gw:module-depends-on mod "gw-engine")
+  (gw:module-depends-on mod "gw-glib")
 
   (gw:module-set-guile-module! mod '(g-wrapped gw-gnome-utils))
 
@@ -39,6 +41,9 @@
      (list 
       "#include <gnc-mdi-utils.h>\n"
       "#include <print-session.h>\n"
+      "#include <gnc-menu-extensions.h>\n"
+      "#include <gnc-html.h>\n"
+      "#include <gnc-ui.h>\n"
       )))
 
   (let ((nnt (gw:wrap-non-native-type
@@ -145,4 +150,33 @@
    "gnc_print_session_print"
    '((<gnc:PrintSession*> p))
    "Show the GNOME print dialog to start printing.")
+ (gw:wrap-function
+   mod
+   'gnc:error-dialog
+   '<gw:void>
+   "gnc_error_dialog"
+   '(((<gw:m-chars-caller-owned> gw:const) message))
+   "Show ok dialog box with given error message.")
+
+  (gw:wrap-function
+   mod
+   'gnc:verify-dialog
+   '<gw:bool>
+   "gnc_verify_dialog"
+   '(((<gw:m-chars-caller-owned> gw:const) message) (<gw:bool> yes_is_default))
+   "Show yes/no dialog box with given message.")
+
+  (gw:wrap-function
+   mod
+   'gnc:add-extension
+   '<gw:void>
+   "gnc_add_extension"
+   '((<gw:scm> extension))
+   "")
+
+  (gw:wrap-function 
+   mod
+   'gnc:html-encode-string 
+   '<glib:g-chars-caller-owned> 
+   "gnc_html_encode_string" '(((<gw:m-chars-caller-owned> gw:const) bookname)))
 )

src/gnome-utils/test/Makefile.am

@@ -1,32 +1,11 @@
 TESTS =  \
   test-link-module
-#  test-load-module
-
-TESTS_ENVIRONMENT= \
-   GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
-   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
-   LTDL_LIBRARY_PATH=.. \
-   LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/network-utils:${top_srcdir}/src/network-utils/.libs
-
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
-  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
-  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ${top_srcdir}/src/engine/libgncmod-engine.la \
-   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-   ../libgncmod-gnome-utils.la \
-   ${top_srcdir}/src/engine/libgw-engine.la \
-   ${top_srcdir}/src/engine/libgw-glib.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
-  -lltdl
 
 noinst_PROGRAMS = \
   test-link-module
 
-#EXTRA_DIST = test-load-module
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=../libgncmod-gnome-utils.la 
+
+
 
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}

src/gnome/Makefile.am

@@ -1,6 +1,13 @@
 SUBDIRS = glade
 
-lib_LTLIBRARIES = libgncgnome.la
+lib_LTLIBRARIES = libgncgnome.la libgw-gnc.la
+
+gwmoddir = ${GNC_GWRAP_LIBDIR}
+gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm
+
+libgw_gnc_la_SOURCES = gw-gnc.c
+libgw_gnc_la_LIBADD = ${G_WRAP_LINK_ARGS} ${GLIB_LIBS}
+libgw_gnc_la_LDFLAGS = -module
 
 libgncgnome_la_LDFLAGS = -module
 
@@ -109,6 +116,7 @@ AM_CFLAGS = \
   ${G_WRAP_COMPILE_ARGS} \
   ${GNOME_INCLUDEDIR} \
   ${GNOME_PRINT_CFLAGS} \
+  ${GDK_PIXBUF_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GHTTP_CFLAGS} \
   ${GLADE_CFLAGS} \
@@ -129,3 +137,21 @@ gnucash.keys: gnucash.keys.in
             -e 's:@-icondir-@:${appicondir}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
+
+noinst_DATA = .scm-links
+
+.scm-links: 
+	rm -f gnucash g-wrapped
+	ln -sf . gnucash 
+	ln -sf . g-wrapped 
+	touch .scm-links
+CLEANFILES = .scm-links gnucash g-wrapped
+
+gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: gw-gnc-spec.scm .scm-links
+	FLAVOR=gnome guile -c \
+          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
+           (set! %load-path (cons \"../engine\" %load-path)) \
+           (primitive-load \"./gw-gnc-spec.scm\") \
+           (gw:generate-module \"gw-gnc\")"
+BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
+CLEANFILES += gw-gnc.scm gw-gnc.h gw-gnc.c 

src/gnome/gw-gnc-spec.scm

@@ -0,0 +1,398 @@
+;;; -*-scheme-*-
+(use-modules (g-wrap))
+
+(debug-set! maxdepth 100000)
+(debug-set! stack    2000000)
+
+(define-module (g-wrapped gw-gnc-spec)
+  :use-module (g-wrap))
+
+(use-modules (g-wrapped gw-engine-spec))
+(use-modules (g-wrapped gw-glib-spec))
+
+(let ((mod (gw:new-module "gw-gnc")))
+  (define (standard-c-call-gen result func-call-code)
+    (list (gw:result-get-c-name result) " = " func-call-code ";\n"))
+  
+  (define (add-standard-result-handlers! type c->scm-converter)
+    (define (standard-pre-handler result)
+      (let* ((ret-type-name (gw:result-get-proper-c-type-name result))
+             (ret-var-name (gw:result-get-c-name result)))
+        (list "{\n"
+              "    " ret-type-name " " ret-var-name ";\n")))
+    
+    (gw:type-set-pre-call-result-ccodegen! type standard-pre-handler)
+    
+    (gw:type-set-post-call-result-ccodegen!
+     type
+     (lambda (result)
+       (let* ((scm-name (gw:result-get-scm-name result))
+              (c-name (gw:result-get-c-name result)))
+         (list
+          (c->scm-converter scm-name c-name)
+          "  }\n")))))
+  
+  (gw:module-depends-on mod "gw-runtime")
+  (gw:module-depends-on mod "gw-engine")
+  (gw:module-depends-on mod "gw-glib")
+
+  (gw:module-set-guile-module! mod '(g-wrapped gw-gnc))
+
+  (gw:module-set-declarations-ccodegen!
+   mod
+   (lambda (client-only?)
+     (list
+      "#include <glib.h>\n"
+      "#include <gnucash.h>\n"
+      "#include <gnc-ui.h>\n"
+      "#include <gnc-ui-util.h>\n"
+      "#include <gnc-menu-extensions.h>\n"
+      "#include <date.h>\n"
+      "#include <guile-util.h>\n"
+      "#include <gnc-engine.h>\n"
+      "#include <gnc-commodity.h>\n"
+      "#include <gnc-numeric.h>\n"
+      "#include <window-main.h>\n"
+      "#include <gnc-gui-query.h>\n"
+      "#include <dialog-column-view.h>\n"
+      "#include <dialog-new-user.h>\n"
+      "#include <dialog-print-check.h>\n"
+      "#include <dialog-progress.h>\n"
+      "#include <dialog-style-sheet.h>\n"
+      "#include <dialog-totd.h>\n"
+      "#include <dialog-commodity.h>\n"
+      "#include <druid-hierarchy.h>\n"
+      "#include <top-level.h>\n"
+      "#include <window-help.h>\n"
+      "#include <window-report.h>\n"
+      "#include <window-main.h>\n"
+      "#include <gnc-html.h>\n"
+      "#include <dialog-find-transactions.h>\n"
+      "#include <dialog-scheduledxaction.h>\n"
+      "#include <dialog-sxsincelast.h>\n" )))
+
+  (let ((nnt (gw:wrap-non-native-type
+              mod
+              '<gnc:UIWidget>
+              "gncUIWidget" "const gncUIWidget")))
+    #t)
+  
+  (let ((nnt (gw:wrap-non-native-type
+              mod
+              '<gnc:report-window*>
+              "gnc_report_window*" "const gnc_report_window*")))
+    #t)
+    
+  (let ((nnt (gw:wrap-non-native-type
+              mod
+              '<gnc:column-view-edit*>
+              "gnc_column_view_edit*" "const gnc_column_view_edit*")))
+    #t)
+
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-hierarchy-druid
+   '<gw:void>
+   "gnc_ui_hierarchy_druid"
+   '()
+   "Open the hiearchy druid for importing an account hierarchy.")
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-is-running?
+   '<gw:bool>
+   "gnucash_ui_is_running"
+   '()
+   "Predicate to determine if the UI is running.")
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-is-terminating?
+   '<gw:bool>
+   "gnucash_ui_is_terminating"
+   '()
+   "Predicate to determine if the UI is in the process of terminating.")
+
+  (gw:wrap-function
+   mod
+   'gnc:new-user-dialog
+   '<gw:void>
+   "gnc_ui_new_user_dialog"
+   '()
+   "Show the new user dialog.")
+
+  (gw:wrap-function
+   mod
+   'gnc:start-ui-event-loop
+   '<gw:int>
+   "gnc_ui_start_event_loop"
+   '()
+   "Start the UI event loop.")
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-init
+   '<gw:void>
+   "gnucash_ui_init"
+   '()
+   "Initialize the lower level ui parts.")
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-shutdown
+   '<gw:void>
+   "gnc_ui_shutdown"
+   '()
+   "Shutdown the UI.")
+
+  (gw:wrap-function
+   mod
+   'gnc:ui-destroy
+   '<gw:void>
+   "gnc_ui_destroy"
+   '()
+   "Destroy the UI.")
+
+  (gw:wrap-function
+   mod
+   'gnc:report-window
+   '<gw:void>
+   "reportWindow"
+   '((<gw:int> report-id))
+   "Show report window")
+
+  (gw:wrap-function
+   mod
+   'gnc:report-window-reload
+   '<gw:void>
+   "gnc_report_window_reload"
+   '((<gnc:report-window*> wind))
+   "Force reload of a report window")
+
+  (gw:wrap-function
+   mod
+   'gnc:report-window-add-edited-report
+   '<gw:void>
+   "gnc_report_window_add_edited_report"
+   '((<gnc:report-window*> wind) (<gw:scm> report))
+   "Add a report to the list of reports with open editors")
+
+  (gw:wrap-function
+   mod
+   'gnc:report-raise-editor
+   '<gw:void>
+   "gnc_report_raise_editor"
+   '((<gw:scm> report))
+   "Raise the report's editor window")
+  
+  (gw:wrap-function
+   mod
+   'gnc:main-window-open-report
+   '<gw:void>
+   "gnc_main_window_open_report"
+   '((<gw:int> report-id) (<gw:bool> top-level))
+   "Show report window")
+  
+  (gw:wrap-function
+   mod
+   'gnc:print-report
+   '<gw:void>
+   "gnc_print_report"
+   '((<gw:int> report-id))
+   "Print a report with dialog support")
+
+  (gw:wrap-function
+   mod
+   'gnc:style-sheet-dialog-open
+   '<gw:void>
+   "gnc_style_sheet_dialog_open"
+   '()
+   "Show the style sheet editor window.")
+
+  (gw:wrap-function
+   mod
+   'gnc:info-dialog
+   '<gw:void>
+   "gnc_info_dialog"
+   '(((<gw:m-chars-caller-owned> gw:const) message))
+   "Show ok dialog box with given message.")
+
+  (gw:wrap-function
+   mod
+   'gnc:warning-dialog
+   '<gw:void>
+   "gnc_warning_dialog"
+   '(((<gw:m-chars-caller-owned> gw:const) message))
+   "Show warning dialog box with given message.")
+
+  (gw:wrap-function
+   mod
+   'gnc:choose-radio-option-dialog-parented
+   '<gw:int>
+   "gnc_choose_radio_option_dialog_parented"
+   '((<gnc:UIWidget> parent)
+     ((<gw:m-chars-caller-owned> gw:const) title)
+     ((<gw:m-chars-caller-owned> gw:const) msg)
+     (<gw:int> default-choice)
+     (<gnc:list-of-string> choices))
+   "Show a dialog offering different mutually exclusive choices
+in a radio list.")
+
+  (let ((nnt (gw:wrap-non-native-type
+              mod
+              '<gnc:PrintCheckDialog*>
+              "PrintCheckDialog*" "const PrintCheckDialog*")))
+    #t)
+
+  (gw:wrap-function
+   mod
+   'gnc:print-check-dialog-create
+   '<gnc:PrintCheckDialog*>
+   "gnc_ui_print_check_dialog_create"
+   '((<gw:scm> callback))
+   "Pop up a dialog to set up printing a check.")
+  
+  (gw:wrap-function
+   mod
+   'gnc:ui-totd-dialog-create-and-run
+   '<gw:void>
+   "gnc_ui_totd_dialog_create_and_run"
+   '()
+   "Create and run the \"Tip Of The Day\" dialog")
+
+  (let ((nnt (gw:wrap-non-native-type
+              mod
+              '<gnc:ProgressDialog*>
+              "GNCProgressDialog *" "const GNCProgressDialog *")))
+    #t)
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-new
+   '<gnc:ProgressDialog*>
+   "gnc_progress_dialog_new"
+   '((<gnc:UIWidget> parent) (<gw:bool> use_ok_button))
+   "Create and return a progress dialog. The parent may be NULL.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-title
+   '<gw:void>
+   "gnc_progress_dialog_set_title"
+   '((<gnc:ProgressDialog*> progress)
+     ((<gw:m-chars-caller-owned> gw:const) title))
+   "Set the title of 'progress' to 'title'.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-heading
+   '<gw:void>
+   "gnc_progress_dialog_set_heading"
+   '((<gnc:ProgressDialog*> progress)
+     ((<gw:m-chars-caller-owned> gw:const) heading))
+   "Set the heading of 'progress' to 'heading'.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-limits
+   '<gw:void>
+   "gnc_progress_dialog_set_limits"
+   '((<gnc:ProgressDialog*> progress)
+     (<gw:float> min)
+     (<gw:float> max))
+   "Set the mininum and maximum range of 'progress'.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-activity-mode
+   '<gw:void>
+   "gnc_progress_dialog_set_activity_mode"
+   '((<gnc:ProgressDialog*> progress)
+     (<gw:bool> activity-mode))
+   "Set the mininum and maximum range of 'progress'.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-cancel-scm-func
+   '<gw:void>
+   "gnc_progress_dialog_set_cancel_scm_func"
+   '((<gnc:ProgressDialog*> progress)
+     (<gw:scm> cancel_func))
+   "Set the guile cancel callback function. This callback is invoked
+with no arguments when the user hits the cancel button. If the callback
+returns #t, the dialog is closed, but not destroyed.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-set-value
+   '<gw:void>
+   "gnc_progress_dialog_set_value"
+   '((<gnc:ProgressDialog*> progress) (<gw:float> value))
+   "Set the value of the progress dialog to 'value'.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-update
+   '<gw:void>
+   "gnc_progress_dialog_update"
+   '((<gnc:ProgressDialog*> progress))
+   "Update the progress bar, calling any pending cancel callback.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-finish
+   '<gw:void>
+   "gnc_progress_dialog_finish"
+   '((<gnc:ProgressDialog*> progress))
+   "Set the progress dialog to the finished state. The OK button becomes
+sensitive and the dialog closes after the user clicks it.")
+
+  (gw:wrap-function
+   mod
+   'gnc:progress-dialog-destroy
+   '<gw:void>
+   "gnc_progress_dialog_destroy"
+   '((<gnc:ProgressDialog*> progress))
+   "Destroy the progess dialog. You must call this function in
+order to destroy the dialog. The dialog will not be destroyed
+by the user closing the window.")
+
+  (gw:wrap-function
+   mod
+   'gnc:default-options-editor
+   '<gnc:UIWidget>
+   "gnc_report_window_default_params_editor"
+   '((<gw:scm> options) (<gw:scm> report))
+   "Default options editor window for reports")
+
+  (gw:wrap-function
+   mod
+   'gnc:column-view-edit-options
+   '<gnc:UIWidget>
+   "gnc_column_view_edit_options"
+   '((<gw:scm> options) (<gw:scm> view))
+   "Create an editor for a column-view options object")
+
+  (gw:wrap-function
+   mod
+   'gnc:sx-editor
+   '<gw:void>
+   "gnc_ui_scheduled_xaction_dialog_create" '()
+   "Open the Scheduled Transaction Editor" )
+
+  (gw:wrap-function
+   mod
+   'gnc:sx-sincelast-create
+   '<gw:bool>
+   "gnc_ui_sxsincelast_dialog_create" '()
+   "Wrapper to open the since-last-run dialog from a book-open hook." )
+
+  (gw:wrap-function
+   mod
+   'gnc:sx-since-last-run-wrapper
+   '<gw:bool>
+   "gnc_ui_sxsincelast_guile_wrapper" '(((<gw:m-chars-caller-owned>) bookfile))
+   "Wrapper to open the since-last-run dialog from a book-open hook." )
+
+  )

src/import-export/binary-import/Makefile.am

@@ -31,24 +31,12 @@ gncinclude_HEADERS = \
 libgncmod_binary_import_la_LDFLAGS = -module
 
 libgncmod_binary_import_la_LIBADD = \
-  -L${top_srcdir}/src/gnc-module \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
-  -L${top_srcdir}/src/gnc-module/.libs \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
-  -lgncmodule \
+  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
-  -L${top_srcdir}/src/engine \
+  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-  -L${top_srcdir}/src/engine/.libs \
+  ${top_srcdir}/src/app-file/libgncmod-app-file.la \
-  -lgncmod-engine \
+  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  -L${top_srcdir}/src/calculation \
-  -L${top_srcdir}/src/calculation/.libs \
-  -lgncmod-calculation \
-  -L${top_srcdir}/src/app-utils \
-  -L${top_srcdir}/src/app-utils/.libs \
-  -lgncmod-app-utils \
-  -L${top_srcdir}/src/app-file \
-  -L${top_srcdir}/src/app-file/.libs \
-  -lgncmod-app-file \
-  -L${top_srcdir}/src/gnome-utils \
-  -L${top_srcdir}/src/gnome-utils/.libs \
-  -lgncmod-gnome-utils \
   ${GNOMEUI_LIBS} \
   ${GNOME_LIBDIR} \
   ${GUILE_LIBS} \

src/import-export/binary-import/test/Makefile.am

@@ -1,40 +1,10 @@
 TESTS =  \
   test-link-module
-#  test-load-module
 
-TESTS_ENVIRONMENT= \
+test_link_module_SOURCES=test-link-module.c
-   GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir/src/gnc-module:${top_srcdir}/src/calculation:.. \
+test_link_module_LDADD=../libgncmod-binary-import.la 
-   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
-   LTDL_LIBRARY_PATH=.. \
-   LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs
-
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
-  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
-  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
-  -L${top_srcdir}/src/gnome-utils -L${top_srcdir}/src/gnome-utils/.libs \
-  -L${top_srcdir}/src/app-file -L${top_srcdir}/src/app-file/.libs \
-  -L${top_srcdir}/src/app-file/gnome -L${top_srcdir}/src/app-file/gnome/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ${top_srcdir}/src/calculation/libgncmod-calculation.la \
-   ${top_srcdir}/src/engine/libgncmod-engine.la \
-   ${top_srcdir}/src/network-utils/libgncmod-network-utils.la \
-   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_srcdir}/src/app-file/libgncmod-app-file.la \
-   ${top_srcdir}/src/app-file/gnome/libgncmod-app-file-gnome.la \
-   ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ../libgncmod-binary-import.la \
-   ${top_srcdir}/src/engine/libgw-engine.la \
-   ${top_srcdir}/src/engine/libgw-glib.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
-  -lltdl
 
 noinst_PROGRAMS = \
   test-link-module
 
-#EXTRA_DIST = test-load-module
-
 AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}

src/import-export/qif-import/Makefile.am

@@ -1,3 +1,4 @@
+SUBDIRS = . test
 
 pkglib_LTLIBRARIES=libgncmod-qif-import.la
 
@@ -10,8 +11,13 @@ noinst_HEADERS = \
   dialog-account-picker.h \
   druid-qif-import.h
 
-libgncmod_qif_import_la_LDFLAGS = \
+libgncmod_qif_import_la_LDFLAGS = -module 
-  -module \
+
+libgncmod_qif_import_la_LIBADD = \
+  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_srcdir}/src/app-file/libgncmod-app-file.la \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${GLIB_LIBS} \
@@ -50,6 +56,7 @@ AM_CFLAGS = \
   ${GLIB_CFLAGS} \
   ${GNOME_PRINT_CFLAGS} \
   ${GNOME_INCLUDEDIR} \
+  ${GDK_PIXBUF_CFLAGS} \
   ${GTKHTML_CFLAGS}
 
 EXTRA_DIST = \

src/import-export/qif-import/test/Makefile.am

@@ -0,0 +1,6 @@
+TESTS=test-link
+
+noinst_PROGRAMS=test-link
+
+test_link_SOURCES=test-link.c
+test_link_LDADD=../libgncmod-qif-import.la 

src/import-export/qif-import/test/test-link.c

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

src/network-utils/Makefile.am

@@ -22,7 +22,7 @@ gncinclude_HEADERS = \
 libgncmod_network_utils_la_LDFLAGS = -module
 
 libgncmod_network_utils_la_LIBADD = \
-  -L../gnc-module -L../gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
   ${GHTTP_LIBS} \
   ${GNOME_LIBDIR} \
   ${GNOME_LIBS} \

src/network-utils/test/Makefile.am

@@ -8,15 +8,13 @@ TESTS_ENVIRONMENT= \
    LTDL_LIBRARY_PATH=.. \
    LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs
 
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ../libgncmod-network-utils.la \
-  -lltdl
 
 noinst_PROGRAMS = \
   test-link-module
 
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=../libgncmod-network-utils.la
+
 #EXTRA_DIST = test-load-module
 
 AM_CFLAGS = \

src/register/ledger-core/Makefile.am

@@ -23,6 +23,8 @@ noinst_HEADERS = \
   split-register-p.h
 
 libgncmod_ledger_core_la_LDFLAGS = -module
+libgncmod_ledger_core_la_LIBADD = \
+  ${top_srcdir}/src/gnome/libgncgnome.la 
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \

src/register/ledger-core/test/Makefile.am

@@ -1,40 +1,10 @@
 TESTS =  \
   test-link-module
-#  test-load-module
-
-TESTS_ENVIRONMENT= \
-   GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
-   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
-   LTDL_LIBRARY_PATH=.. \
-   LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs
-
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
-  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
-  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
-  -L${top_srcdir}/src/gnome-utils -L${top_srcdir}/src/gnome-utils/.libs \
-  -L${top_srcdir}/src/register/register-core \
-  -L${top_srcdir}/src/register/register-core/.libs \
-  -L${top_srcdir}/src/register/register-gnome \
-  -L${top_srcdir}/src/register/register-gnome/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ${top_srcdir}/src/engine/libgncmod-engine.la \
-   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
-   ${top_srcdir}/src/register/register-gnome/libgncmod-register-gnome.la \
-   ../libgncmod-ledger-core.la \
-   ${top_srcdir}/src/engine/libgw-engine.la \
-   ${top_srcdir}/src/engine/libgw-glib.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
-  -lltdl
 
 noinst_PROGRAMS = \
   test-link-module
 
-#EXTRA_DIST = test-load-module
+test_link_module_SOURCES=test-link.module.c
+test_link_module_LDADD=../libgncmod-ledger-core.la
 
 AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}

src/register/register-core/Makefile.am

@@ -3,6 +3,12 @@ SUBDIRS = . test
 pkglib_LTLIBRARIES = libgncmod-register-core.la
 
 libgncmod_register_core_la_LDFLAGS = -module
+libgncmod_register_core_la_LIBADD = \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${GLIB_LIBS}
 
 libgncmod_register_core_la_SOURCES = \
   gncmod-register-core.c \
@@ -21,6 +27,7 @@ libgncmod_register_core_la_SOURCES = \
   table-layout.c \
   table-model.c
 
+
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
   QuickFill.h \

src/register/register-core/test/Makefile.am

@@ -8,27 +8,12 @@ TESTS_ENVIRONMENT= \
    LTDL_LIBRARY_PATH=.. \
    LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/network-utils:${top_srcdir}/src/network-utils/.libs
 
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
-  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
-  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
-  -L${top_srcdir}/src/gnome-utils -L${top_srcdir}/src/gnome-utils/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ${top_srcdir}/src/engine/libgncmod-engine.la \
-   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ../libgncmod-register-core.la \
-   ${top_srcdir}/src/engine/libgw-engine.la \
-   ${top_srcdir}/src/engine/libgw-glib.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
-  -lltdl
-
 noinst_PROGRAMS = \
   test-link-module
 
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=../libgncmod-register-core.la
+
 #EXTRA_DIST = test-load-module
 
 AM_CFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..

src/register/register-gnome/Makefile.am

@@ -2,7 +2,15 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-register-gnome.la
 
-libgncmod_register_gnome_la_LDFLAGS = -module ${GNOME_LIBDIR} ${GNOMEUI_LIBS}
+libgncmod_register_gnome_la_LDFLAGS = -module 
+libgncmod_register_gnome_la_LIBADD = \
+  ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${GLIB_LIBS} \
+  ${GNOMEUI_LIBS}
 
 libgncmod_register_gnome_la_SOURCES = \
   gncmod-register-gnome.c \

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

@@ -8,30 +8,12 @@ TESTS_ENVIRONMENT= \
    LTDL_LIBRARY_PATH=.. \
    LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/network-utils:${top_srcdir}/src/network-utils/.libs
 
-LDADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
-  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
-  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
-  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
-  -L${top_srcdir}/src/gnome-utils -L${top_srcdir}/src/gnome-utils/.libs \
-  -L${top_srcdir}/src/register/register-core \
-   -L${top_srcdir}/src/register/register-core/.libs \
-   ${top_srcdir}/src/gnc-module/libgncmodule.la \
-   ${top_srcdir}/src/engine/libgncmod-engine.la \
-   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
-   ../libgncmod-register-gnome.la \
-   ${top_srcdir}/src/engine/libgw-engine.la \
-   ${top_srcdir}/src/engine/libgw-glib.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
-  -lltdl
-
 noinst_PROGRAMS = \
   test-link-module
 
+test_link_module_SOURCES = test-link-module.c
+test_link_module_LDADD = ../libgncmod-register-gnome.la 
+
 #EXTRA_DIST = test-load-module
 
 AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS} 

src/report/locale-specific/us/Makefile.am

@@ -6,6 +6,11 @@ libgncmod_locale_reports_us_la_SOURCES = \
   gncmod-locale-reports-us.c 
 
 libgncmod_locale_reports_us_la_LDFLAGS = -module
+libgncmod_locale_reports_us_la_LIBADD = \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${GUILE_LIBS} \
+  ${GLIB_LIBS}
+
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 

src/report/locale-specific/us/gncmod-locale-reports-us.c

@@ -42,12 +42,21 @@ gnc_module_init(int refcount) {
     return FALSE;
   }
 
+  printf("loaded gnc modules .. \n");
+
   /* load the report generation scheme code */
+  if(gh_eval_str("(use-modules (gnucash report taxtxf))") 
+     == SCM_BOOL_F) {
+    printf("failed to load (gnucash report taxtxf)\n");
+    return FALSE;
+  }
+  printf("loaded taxtxf module\n");
+  
   if(gh_eval_str("(use-modules (gnucash report locale-specific us))") 
      == SCM_BOOL_F) {
     return FALSE;
   }
-  
+
   return TRUE;
 }
 

src/report/locale-specific/us/taxtxf.scm

@@ -27,8 +27,9 @@
 ;; subtracts 2!  see "(to-value"
 
 ;; depends must be outside module scope -- and should eventually go away.
-(define-module (gnucash report taxtxf))
+(simple-format #t "loading taxtxf scheme code\n")
 
+(define-module (gnucash report taxtxf))
 (use-modules (gnucash bootstrap) (g-wrapped gw-gnc)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 slib))

src/report/locale-specific/us/test/Makefile.am

@@ -1,8 +1,20 @@
-TESTS=test-load-module 
+TESTS= test-load-module test-link-module 
 
 TESTS_ENVIRONMENT= \
-  GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-file:${top_srcdir}/src/calculation:${top_srcdir}/src/tax/us:.. \
+  GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-file:${top_srcdir}/src/calculation:${top_srcdir}/src/tax/us:${top_srcdir}/src/report/locale-specific/us \
-  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/app-file:${top_srcdir}/src/guile:${top_srcdir}/src/scm \
+  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/scm:${top_srcdir}/src/app-file:${top_srcdir}/src/gnome:${top_srcdir}/src/report/report-system:${top_srcdir}/src/tax/us:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/report/locale-specific/us:${top_srcdir}/lib \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/app-file:${top_srcdir}/src/app-file/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:${top_srcdir}/src/app-file:${top_srcdir}/src/app-file/gnome:${top_srcdir}/src/gnome:${top_srcdir}/src/report/report-system:${top_srcdir}/src/tax/us:${top_srcdir}/src/scm:..
 
 EXTRA_DIST = test-load-module
+
+noinst_PROGRAMS=test-link-module
+
+testit:
+	${TESTS_ENVIRONMENT} gdb guile
+
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD= \
+ ${top_srcdir}/src/report/locale-specific/us/libgncmod-locale-reports-us.la
+
+
+ 

src/report/locale-specific/us/test/test-link-module.c

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

src/report/locale-specific/us/test/test-load-module

@@ -1,11 +1,14 @@
 #! /bin/sh 
-exec guile -s "$0"
+exec guile -s $0
 !#
 
-(display "  testing US locale-specific report module load ... ")
 (use-modules (gnucash gnc-module))
 (gnc:module-system-init)
 
+(display "  testing US locale-specific report module load ... ")
+(gnc:module-load "gnucash/app-file" 0)
+
+(display "  (done with precursor) ... ")
 (if (gnc:module-load "gnucash/report/locale-specific/us" 0)
     (begin 
       (display "ok\n")

src/report/report-system/Makefile.am

@@ -12,7 +12,7 @@ gncinclude_HEADERS = \
 
 libgncmod_report_system_la_LDFLAGS = -module
 libgncmod_report_system_la_LIBADD = \
-  -L../../gnc-module -L../../gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
   ${GLIB_LIBS} \
   ${GUILE_LIBS} 
 

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

@@ -4,13 +4,11 @@ TESTS = \
 
 TESTS_ENVIRONMENT= \
   GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:.. \
-  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/lib:${top_srcdir}/src/scm:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine:${top_srcdir}/src/guile \
+  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/lib:${top_srcdir}/src/scm:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine:${top_srcdir}/src/gnome \
   LTDL_LIBRARY_PATH=.. \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/app-utils:${top_srcdir}/src/engine:${top_srcdir}/src/calculation:${top_srcdir}/src/gnome
 
-LDADD = \
+LDADD = ../libgncmod-report-system.la 
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
-  ../libgncmod-report-system.la 
 
 noinst_PROGRAMS = test-link-module 
 

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

@@ -1,8 +1,8 @@
 TESTS=test-load-module 
 
 TESTS_ENVIRONMENT= \
-  GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:..:${top_srcdir}/src/guile:${top_srcdir}/src/scm \
+  GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:..:${top_srcdir}/src/gnome:${top_srcdir}/src/scm \
   GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR} \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:${top_srcdir}/src/gnome
 
 EXTRA_DIST = test-load-module

src/report/stylesheets/test/Makefile.am

@@ -3,6 +3,6 @@ TESTS=test-load-module
 TESTS_ENVIRONMENT= \
   GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:.. \
   GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/guile:${top_srcdir}/src/scm \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/engine:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:${top_srcdir}/src/guile
 
 EXTRA_DIST = test-load-module

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

@@ -2,7 +2,7 @@ TESTS=test-load-module
 
 TESTS_ENVIRONMENT= \
   GNC_MODULE_PATH=${top_srcdir}/src/engine:${top_srcdir}/src/report/report-system:${top_srcdir}/src/app-utils:${top_srcdir}/src/calculation:.. \
-  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/guile:${top_srcdir}/src/scm \
+  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/gnome:${top_srcdir}/src/scm \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/app-utils:${top_srcdir}/src/app-utils/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs:${top_srcdir}/src/gnome:${top_srcdir}/src/gnome/.libs
 
 EXTRA_DIST = test-load-module

src/tax/us/Makefile.am

@@ -6,6 +6,9 @@ libgncmod_tax_us_la_SOURCES = \
   gncmod-tax-us.c 
 
 libgncmod_tax_us_la_LDFLAGS = -module
+libgncmod_tax_us_la_LIBADD = \
+ ${GLIB_LIBS} \
+ ${GUILE_LIBS} 
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
 

src/tax/us/test/Makefile.am

@@ -1,8 +1,12 @@
-TESTS = test-load-module 
+TESTS = test-link-module test-load-module 
 
 TESTS_ENVIRONMENT= \
   GNC_MODULE_PATH=.. \
-  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/scm:${top_srcdir}/src/guile:${top_srcdir}/src/engine \
+  GUILE_LOAD_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/lib:..:${G_WRAP_MODULE_DIR}:${top_srcdir}/src/scm:${top_srcdir}/src/gnome:${top_srcdir}/src/engine \
-  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/scm:${top_srcdir}/src/guile:${top_srcdir}/src/guile/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${top_srcdir}/src/gnc-module:${top_srcdir}/src/scm:${top_srcdir}/src/gnome:${top_srcdir}/src/engine
 
 EXTRA_DIST = test-load-module
+
+noinst_PROGRAMS=test-link-module 
+test_link_module_SOURCES=test-link-module.c
+test_link_module_LDADD=../libgncmod-tax-us.la 

src/test-core/Makefile.am

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES=libgncmod-test.la
 libgncmod_test_la_SOURCES = gncmod-test.c test-stuff.c
 libgncmod_test_la_LDFLAGS = -module
 libgncmod_test_la_LIBADD = \
-  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs -lgncmodule \
+  ${top_srcdir}/src/gnc-module/libgncmodule.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-stuff.h