diff --git a/ChangeLog b/ChangeLog
index f9f995dfcf..90bea3c3c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2003-01-15  John H. Pierce <john@killterm.org>
+
+	* Makefile.am:
+	* configure.in:
+	* src/app-file/Makefile.am:
+	* src/app-utils/Makefile.am:
+	* src/backend/net/Makefile.am:
+	* src/backend/rpc/Makefile.am:
+	* src/bin/Makefile.am:
+	* src/business/business-core/Makefile.am:
+	* src/business/business-gnome/Makefile.am:
+	* src/business/dialog-tax-table/Makefile.am:
+	* src/core-utils/Makefile.am:
+	* src/engine/Makefile.am:
+	* src/experimental/cgi-bin/Makefile.am:
+	* src/experimental/cgi-bin/fastcgi-hello.c:
+	* src/experimental/cgi-bin/gnc-server.c:
+	* src/experimental/cgi-bin/hello3.c:
+	* src/gnc-module/Makefile.am:
+	* src/gnc-module/test/mod-bar/Makefile.am:
+	* src/gnc-module/test/mod-baz/Makefile.am:
+	* src/gnc-module/test/mod-foo/Makefile.am:
+	* src/gnome/Makefile.am:
+	* src/gnome-search/Makefile.am:
+	* src/gnome-utils/Makefile.am:
+	* src/import-export/binary-import/Makefile.am:
+	* src/import-export/hbci/test/Makefile.am:
+	* src/register/register-core/Makefile.am:
+	* src/report/report-gnome/Makefile.am: Changes to make the build
+	system work on multiple architectures and with multiple versions
+	of the autotools suite.
+
+	* Makefile.DEPS:
+	* src/bin/strsub.c: New files needed for automake 1.4.  These can
+	be removed when automake 1.4 is no longer supported for building
+	gnucash.
+
 2003-01-15  Derek Atkins  <derek@ihtfp.com>
 
 	* src/app-utils/test/test-print-parse-amount.c: set force_fit and
diff --git a/Makefile.DEPS b/Makefile.DEPS
new file mode 100644
index 0000000000..505d682c84
--- /dev/null
+++ b/Makefile.DEPS
@@ -0,0 +1,151 @@
+# Makefile.DEPS
+#
+# Automatically generate depends without actually building anything
+# This is used for maintainers who won't or can't build all
+# parts of a project before running make dist.
+#
+# Note this is only needed for automake 1.4 and requires gcc.
+# If you're using automake 1.5, throw this monstrosity out!
+# This is a gross hack, you really should NOT use this.
+#
+# YOU REALLY SHOULD NOT USE THIS
+# 
+# Copyright 2003 John H. Pierce <john@killterm.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Have I mentioned YOU REALLY SHOULD NOT USE THIS?
+#
+# If you really must use this, add the following to the top level
+# Makefile.am and see src/bin for strsub.
+#
+# Add to EXTRA_DIST Makefile.DEPS (this file) and "distdep-automake1.4-hack"
+# Add these targets:
+#
+#distdep-automake1.4-hack: distdep
+#
+#distdep:
+#	$(MAKE) $(AM_MAKE_FLAGS) -f ${top_srcdir}/Makefile.DEPS \
+#		all-distdep-recursive
+#
+
+# If you're here trying to get rid of the delay comment out the next line
+PAUSE = true
+
+include Makefile
+
+# override objects you don't want depended here
+# This is needed for autogenerated sources you don't have the tools
+# to build.
+libgncswig_la_OBJECTS =
+
+ifeq ($(strip $(DIST_SUBDIRS)),)
+DISTDEP_SUBDIRS = $(SUBDIRS)
+else
+DISTDEP_SUBDIRS = $(DIST_SUBDIRS)
+endif
+
+# Filter out intl and po
+ifeq ($(top_builddir), .)
+DISTDEP_SUBDIRS := $(filter-out intl po, $(DISTDEP_SUBDIRS))
+endif
+
+# Get rid of -Werror because we don't get ANY deps then.
+# Don't set CFLAGS or any other stuff in COMPILE after this.
+COMPILE := $(filter-out -Werror, $(COMPILE))
+
+STRSUB_PATH = $(top_builddir)/src/bin
+STRSUB_BIN = strsub
+STRSUB = $(STRSUB_PATH)/$(STRSUB_BIN)
+
+ifeq ($(shell $(AUTOMAKE) --version | \
+	grep '(GNU automake) 1.4'), )
+DONT_USE_THIS = donotuseme ;
+else
+DONT_USE_THIS = distdep-recursive
+endif
+
+
+donotuseme: ;
+	@echo "*************************************************************"
+	@echo "You should NOT use this script with this version of automake."
+	@echo "Read the comments in Makefile.DEPS"
+	@echo "To continue without this pause run 'make PAUSE=false dist'"
+	@echo "*************************************************************"
+	@if test x$(PAUSE) = xtrue; then \
+		echo -n "Pausing" ; \
+		i=0; while test $$i -lt 60; do \
+			echo -n . ; \
+			sleep 1 ; \
+			let "i=$$i+1" ; \
+		done ; \
+		echo "" ; \
+	fi 
+
+
+$(STRSUB):
+	$(MAKE) $(AM_MAKEFLAGS) -C $(STRSUB_PATH) $(STRSUB_BIN)
+
+all: all-distdep-recursive ;
+
+all-distdep-recursive: $(DONT_USE_THIS)
+
+distdep-recursive: distdep-local
+	@full_tsdir=`cd ${top_srcdir} && pwd`; \
+	for subdir in $(DISTDEP_SUBDIRS); do \
+		if test "$$subdir" != "." && test -d "$$subdir"; then \
+			$(MAKE) $(AM_MAKEFLAGS) -f "$$full_tsdir/Makefile.DEPS" \
+				-C $$subdir all-distdep-recursive || exit 1; \
+		fi \
+	done
+
+distdep-local: $(STRSUB) $(OBJECTS) ;
+
+# sed plan
+# turn:
+# foo.o: bar.c ../blah.c \
+#  /usr/include/stdio.h top_srcdir/our-incs/baz.h \
+#  ../../src/built-header/built.h
+# into
+# foo.o : \
+#  bar.c \
+#  blah.c \
+#  top_builddir/baz.h \
+#  ../../src/built-header/built.h
+#  
+# tr gets us 1 file per line
+# s/^\\$//		kill the trailing \'s
+# s/^$/			kill empty lines
+# /^\// d		remove headers with absolute paths, they're system ones
+# $(STRSUB) "$(top_srcdir)" "$(top_buildir)"
+#           	make relative to build env
+#           	VPATH takes care of non-srcdir build
+# - Second sed invocation is to reset the line #'s
+# 2,$s/^\(.*\)$/ \1 \\/		add leading space and \ to every line but 1
+# 1s/$/ \\/		add space and \ to line 1
+# $s/ \\$//'	remove the space from the last line
+%.o: %.c
+	@echo "creating .deps/$(*F).P"
+	@$(COMPILE) -MG -MM -o $@ $< | tr ' ' '\012' \
+	| $(STRSUB) "$(top_srcdir)" "$(top_builddir)" \
+	| sed  -e 's/\\$$//' -e '/^$$/ d' -e '/^\// d' \
+	| sed -e '2,$$s/^\(.*\)$$/ \1 \\/' -e '1s/$$/ \\/' -e '$$s/ \\$$//' \
+	> .deps/$(*F).P || exit 1;
+
+%.lo: %.c
+	@echo "creating .deps/$(*F).P"
+	@$(COMPILE) -MG -MM -o $@ $< | tr ' ' '\012' \
+	| $(STRSUB) "$(top_srcdir)" "$(top_builddir)" \
+	| sed  -e 's/\\$$//' -e '/^$$/ d' -e '/^\// d' \
+	| sed -e '2,$$s/^\(.*\)$$/ \1 \\/' -e '1s/$$/ \\/' -e '$$s/ \\$$//' \
+	> .deps/$(*F).P || exit 1;
+
+
diff --git a/Makefile.am b/Makefile.am
index 84c340889a..96a3713910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,12 @@ docdir = ${GNC_DOC_INSTALL_DIR}
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
 
+if GNC_FALSE
+noinst_PROGRAMS = dummy
+
+dummy_SOURCES = dummy.c
+endif
+
 noinst_DATA = make-gnucash-patch make-gnucash-potfiles
 
 doc_DATA = \
@@ -53,7 +59,9 @@ EXTRA_DIST = config.rpath  \
   po/glossary/txt-to-pot.sh \
   intltool-extract.in \
   intltool-merge.in \
-  intltool-update.in
+  intltool-update.in \
+  Makefile.DEPS \
+  distdep-automake1.4-hack
 
 bin_SCRIPTS = gnucash-config
 
@@ -79,7 +87,8 @@ make-gnucash-potfiles: make-gnucash-potfiles.in
 
 DISTCLEANFILES = \
   intltool-extract intltool-update intltool-merge\
-  cscope.files cscope.out etags.files make-gnucash-patch make-gnucash-potfiles
+  cscope.files cscope.out etags.files make-gnucash-patch \
+  make-gnucash-potfiles po/.intltool-merge-cache
 
 cscope.files:
 	find . -name '*.[ch]' > cscope.files
@@ -125,5 +134,26 @@ ACLOCAL_AMFLAGS = -I m4
 doc:
 	$(MAKE) -C src/doc doc
 
+.PHONY: distdep
+
+#
+# All references to distdep-automake1.4-hack can be removed when
+# Automake 1.4 is no longer used to compile gnucash.  The files
+# Makefile.DEPS and src/bin/strsub.c are also specific to AM 1.4 and
+# can be removed at the same time.  See the commit at 2003-01-15 00:45
+# UTC for more information.
+#
+distdep-automake1.4-hack: distdep
+	: > distdep-automake1.4-hack
+
+distdep:
+	test x"$(DEP_FILES)" = x || \
+	$(MAKE) $(AM_MAKE_FLAGS) -f ${top_srcdir}/Makefile.DEPS \
+		all-distdep-recursive
+
+dist-hook:
+	rm -f $(distdir)/distdep-automake1.4-hack
+	rm -f distdep-automake1.4-hack
+
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
diff --git a/configure.in b/configure.in
index e1d4ec05b0..bafd9e8e5b 100644
--- a/configure.in
+++ b/configure.in
@@ -1012,6 +1012,7 @@ AC_SUBST(GNUCASH_REGISTER_CORE_CFLAGS)
 AC_SUBST(GNUCASH_REGISTER_CORE_LIBS)
 
 AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
+AM_CONDITIONAL(GNC_FALSE, false)
 
 ### --------------------------------------------------------------------------
 ### Adjustments -- especially executables that aren't generated via
diff --git a/src/app-file/Makefile.am b/src/app-file/Makefile.am
index 9fb326f3d9..4eb2184475 100644
--- a/src/app-file/Makefile.am
+++ b/src/app-file/Makefile.am
@@ -63,7 +63,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-app-file.scm gw-app-file.c gw-app-file.h: .scm-links gw-app-file-spec.scm
+gw-app-file.scm gw-app-file.c gw-app-file.h: \
+  .scm-links gw-app-file-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 70c703fae0..dec231913d 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -91,7 +91,7 @@ EXTRA_DIST = \
 ## brackets here, instead of the usual @...@.  This prevents autoconf
 ## from substituting the values directly into the left-hand sides of
 ## the sed substitutions.
-i18n.h: i18n.h.in
+i18n.h: i18n.h.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
             -e 's:@-PACKAGE-@:${PACKAGE}:g' \
@@ -120,7 +120,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-app-utils.scm gw-app-utils.c gw-app-utils.h: .scm-links gw-app-utils-spec.scm
+gw-app-utils.scm gw-app-utils.c gw-app-utils.h: \
+  .scm-links gw-app-utils-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/backend/net/Makefile.am b/src/backend/net/Makefile.am
index 8c8e2be873..50c75712e1 100644
--- a/src/backend/net/Makefile.am
+++ b/src/backend/net/Makefile.am
@@ -4,7 +4,8 @@ pkglib_LTLIBRARIES = libgncmod-backend-net.la
 
 AM_CFLAGS = \
   -I.. -I../.. \
-  -I../../engine \
+  -I../../engine -I${srcdir}/../../engine \
+  -I../file -I${srcdir}/../file \
   -I../../gnc-module \
   ${GLIB_CFLAGS}
 
diff --git a/src/backend/rpc/Makefile.am b/src/backend/rpc/Makefile.am
index bad6e726c0..8a7af7e346 100644
--- a/src/backend/rpc/Makefile.am
+++ b/src/backend/rpc/Makefile.am
@@ -46,7 +46,10 @@ EXTRA_DIST = \
 LDADD = -lpthread
 
 AM_CFLAGS = \
-  -I.. -I../../engine -I../../gnc-module ${GLIB_CFLAGS} -DGNCACCT_COMMODITY
+  -I.. -I${srcdir}/.. \
+  -I../../engine -I${srcdir}/../../engine \
+  -I../../gnc-module -I${srcdir}/../../gnc-module \
+  ${GLIB_CFLAGS} -DGNCACCT_COMMODITY
 
 #RPCGEN=rpcgen -M
 RPCGEN=rpcgen -DGNCACCT_COMMODITY
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 270c89f734..bccb7cd678 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,6 +1,8 @@
 # Order is important here.
 SUBDIRS = . overrides test
 
+AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS}
+
 # We handle gnucash scripts in a somewhat unexpected way, but we do
 # this so that a user who doesn't necessarily have the right
 # directories in their path can still invoke these commands via their
@@ -20,6 +22,10 @@ gnc_common_scripts = gnucash gnucash-env gnucash-run-script gnucash-make-guids
 
 bin_SCRIPTS = ${gnc_common_scripts}
 
+noinst_PROGRAMS = strsub
+strsub_SOURCES = strsub.c
+strsub_LDADD = ${GLIB_LIBS}
+
 # if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
 gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
 
diff --git a/src/bin/strsub.c b/src/bin/strsub.c
new file mode 100644
index 0000000000..75fde9e1c9
--- /dev/null
+++ b/src/bin/strsub.c
@@ -0,0 +1,115 @@
+/* strsub.c -- Do literal line-by line string replacement.
+ *
+ * Copyright (c) 2003 John H. Pierce <john@killterm.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * See http://www.gnu.org/ for details.
+ *
+ * This is a very stupid program for the distdep target because I
+ * can't figure out an easy way to get sed to not interpret RE chars
+ * in the pattern space without complicated and error-prone escaping.
+ *
+ * Reads stdin line by line and replaces the first occurance of
+ * <str1> with <str2> and prints the resulting line to stdout.
+ *
+ * Lines which do not contain <str1> are printed unchanged.
+ */
+
+#define _GNU_SOURCE 1
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+
+void do_subst(gchar *, gchar *);
+gchar * getwholeline(FILE *);
+void useage(void);
+
+void
+useage(void)
+{
+	fprintf(stderr,
+		"Useage: strsub <str1> <str2>\n"
+		"  Replaces the first occurance of str1 with str2 in each line.\n");
+	exit(EXIT_FAILURE);
+}
+
+int
+main(int argc, char **argv)
+{
+	gchar *str1 = NULL;
+	gchar *str2 = NULL;
+
+	if (argc != 3)
+		useage();
+
+	if (argv + 1)
+		str1 = (gchar *)*(argv + 1);
+
+	if (argv + 2)
+		str2 = (gchar *)*(argv + 2);
+
+	if (!str1 || !str2)
+		useage();
+
+	do_subst(str1, str2);
+
+	exit(EXIT_SUCCESS);
+}
+
+void
+do_subst(gchar *s1, gchar *s2)
+{
+	gchar *inln;
+	gchar **split;
+	gchar *jstr;
+
+	while ((inln = getwholeline(stdin)))
+	{
+		split = g_strsplit(inln, s1, 1);
+		g_assert(split != NULL);
+		jstr = g_strjoinv(s2, split);
+		printf(jstr);
+		g_free(jstr);
+		g_free(inln);
+		g_strfreev(split);
+	}
+}
+
+/* read a whole line that may be really big.  free return w/g_free() */
+gchar *
+getwholeline(FILE *infile)
+{
+	GStringChunk *gs;
+	size_t retlen;
+	const gint strsize = 100;
+	gchar tmp[100];
+	gchar *ostr = NULL;
+	gchar *ret;
+
+	if ((gs = g_string_chunk_new(strsize)))
+	{
+		do
+		{
+			if(!fgets((char*)tmp, strsize, infile))
+				break;
+
+			ostr = g_string_chunk_insert(gs, tmp);
+
+			retlen = strlen(ostr);
+		} while (retlen - 1 >= 0 && *(ostr + retlen - 1) != '\n');
+	}
+	
+	
+	ret = g_strdup(ostr);
+	g_string_chunk_free(gs);
+	return ret;
+}
+
diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am
index 6b633a2ae2..875b4cb7ca 100644
--- a/src/business/business-core/Makefile.am
+++ b/src/business/business-core/Makefile.am
@@ -96,7 +96,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-business-core.scm gw-business-core.c gw-business-core.h: .scm-links gw-business-core-spec.scm
+gw-business-core.scm gw-business-core.c gw-business-core.h: \
+ .scm-links gw-business-core-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 1b6494a4ee..26e9f8d7ca 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -116,7 +116,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: .scm-links gw-business-gnome-spec.scm
+gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \
+  .scm-links gw-business-gnome-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am
index d987a4f2da..34a6618edc 100644
--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = \
 libgncmod_dialog_tax_table_la_LDFLAGS = -module
 
 libgncmod_dialog_tax_table_la_LIBADD = \
-  ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ../../gnc-module/libgncmodule.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBDIR} \
   ${GNOMEUI_LIBS} \
@@ -70,7 +70,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: .scm-links gw-dialog-tax-table-spec.scm
+gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \
+  .scm-links gw-dialog-tax-table-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 5db951ae2b..4b04004d5d 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -12,7 +12,7 @@ libgw_core_utils_la_SOURCES = gw-core-utils.c
 libgw_core_utils_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS} ${GUILE_LIBS}
 libgw_core_utils_la_LIBADD = libcore-utils.la
 
-noinst_HEADERS = core-utils.h gw-core-utils.h
+noinst_HEADERS = core-utils.h
 
 EXTRA_DIST = .cvsignore gw-core-utils-spec.scm
 
@@ -35,7 +35,7 @@ endif
 	touch .scm-links
 
 gw-core-utils.scm gw-core-utils.h gw-core-utils.c gw-core-utils.html: \
-  gw-core-utils-spec.scm .scm-links
+  gw-core-utils-spec.scm .scm-links ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
           "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
            (primitive-load \"./gw-core-utils-spec.scm\") \
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index a362aacb39..7a731e3a8a 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -172,14 +172,16 @@ iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ${srcdir}/iso-currencies-to-c
 	GUILE_LOAD_PATH=${top_srcdir}/lib/:${GUILE_LOAD_PATH} srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
 
-gw-engine.scm gw-engine.c gw-engine.h: .scm-links gw-engine-spec.scm
+gw-engine.scm gw-engine.c gw-engine.h: \
+  .scm-links gw-engine-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
 	 (primitive-load \"./gw-engine-spec.scm\") \
 	 (gw:generate-wrapset \"gw-engine\")"
 
-gw-kvp.scm gw-kvp.c gw-kvp.h: .scm-links gw-kvp-spec.scm
+gw-kvp.scm gw-kvp.c gw-kvp.h: \
+  .scm-links gw-kvp-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
@@ -191,3 +193,6 @@ BUILT_SOURCES = \
   gw-engine.scm gw-engine.c gw-engine.h \
   gw-kvp.scm gw-kvp.c gw-kvp.h 
 
+CLEANFILES = ${BUILT_SOURCES} gw-engine.html gw-kvp.html \
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+
diff --git a/src/experimental/cgi-bin/Makefile.am b/src/experimental/cgi-bin/Makefile.am
index 6855648e27..d07bb575fc 100644
--- a/src/experimental/cgi-bin/Makefile.am
+++ b/src/experimental/cgi-bin/Makefile.am
@@ -5,7 +5,10 @@ bin_PROGRAMS = hello hello2 fastcgi-hello hello3 gnc-server
 
 EXTRA_DIST = .cvsignore
 
-AM_CFLAGS = -I../../engine ${GLIB_CFLAGS}
+AM_CFLAGS = \
+	-I../../engine -I${srcdir}/../../engine \
+	-I../../backend/file -I${srcdir}/../../backend/file \
+	${GLIB_CFLAGS}
 
 LDADD = 			\
   ../../engine/libgncengine.la 	\
diff --git a/src/experimental/cgi-bin/fastcgi-hello.c b/src/experimental/cgi-bin/fastcgi-hello.c
index 14fe3090a0..63ce00c582 100644
--- a/src/experimental/cgi-bin/fastcgi-hello.c
+++ b/src/experimental/cgi-bin/fastcgi-hello.c
@@ -1,5 +1,5 @@
 
-#include "fcgi_stdio.h"
+#include <fcgi_stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/experimental/cgi-bin/gnc-server.c b/src/experimental/cgi-bin/gnc-server.c
index a2a045136e..f730c852bf 100644
--- a/src/experimental/cgi-bin/gnc-server.c
+++ b/src/experimental/cgi-bin/gnc-server.c
@@ -20,7 +20,7 @@
 #include "Group.h"
 #include "io-gncxml.h"
  
-#include "fcgi_stdio.h"
+#include <fcgi_stdio.h>
 
 
 /* ======================================================== */
diff --git a/src/experimental/cgi-bin/hello3.c b/src/experimental/cgi-bin/hello3.c
index 8db65129ab..296d7d9886 100644
--- a/src/experimental/cgi-bin/hello3.c
+++ b/src/experimental/cgi-bin/hello3.c
@@ -19,7 +19,7 @@
 #include "Group.h"
 #include "io-gncxml.h"
  
-#include "fcgi_stdio.h"
+#include <fcgi_stdio.h>
 
 
 int
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 9135044050..cd385186a6 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -55,7 +55,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: .scm-links gw-gnc-module-spec.scm
+gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: \
+  .scm-links gw-gnc-module-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (primitive-load \"./gw-gnc-module-spec.scm\") \
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index 2e7fc559f9..1047418fd1 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
   bar-gwrap.scm \
   gnucash/bar.scm
 
-bar-gwrap.c bar-gwrap.h: bar-gwrap.scm
+bar-gwrap.c bar-gwrap.h: bar-gwrap.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (primitive-load \"${srcdir}/bar-gwrap.scm\") \
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index a1d175c317..dab94e7de5 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = \
   baz-gwrap.scm \
   gnucash/baz.scm
 
-baz-gwrap.c baz-gwrap.h: baz-gwrap.scm
+baz-gwrap.c baz-gwrap.h: baz-gwrap.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (primitive-load \"${srcdir}/baz-gwrap.scm\") \
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index 8c7ea3c538..5e9df1f559 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
   foo-gwrap.scm \
   gnucash/foo.scm
 
-foo-gwrap.c foo-gwrap.h: foo-gwrap.scm
+foo-gwrap.c foo-gwrap.h: foo-gwrap.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
            (primitive-load \"${srcdir}/foo-gwrap.scm\") \
diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am
index aeed01ea9c..fc1da0538b 100644
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@@ -96,7 +96,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h: .scm-links gw-gnome-search-spec.scm
+gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h: \
+  .scm-links gw-gnome-search-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	 (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 33947fd86d..ff75c65a95 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -135,7 +135,7 @@ EXTRA_DIST = \
 ## brackets here, instead of the usual @...@.  This prevents autoconf
 ## from substituting the values directly into the left-hand sides of
 ## the sed substitutions.
-gnc-dir.h: gnc-dir.h.in
+gnc-dir.h: gnc-dir.h.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' \
@@ -144,12 +144,6 @@ gnc-dir.h: gnc-dir.h.in
 	mv $@.tmp $@
 BUILT_SOURCES = gnc-dir.h
 
-# We have to do this because otherwise automake insists on putting
-# these files into the dist tarfile.  If there's a a better way,
-# by all means, let us know...
-dist-hook:
-	rm -f ${distdir}/gnc-dir.h
-
 if GNUCASH_SEPARATE_BUILDDIR
 #For compiling
 SCM_FILE_LINKS = gw-gnome-utils-spec.scm
@@ -168,7 +162,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: .scm-links gw-gnome-utils-spec.scm
+gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \
+  .scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 91fac15c58..0ab1b4ba57 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -176,7 +176,8 @@ endif
 
 DISTCLEANFILES = .scm-links gnucash g-wrapped ${SCM_FILE_LINKS}
 
-gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: gw-gnc-spec.scm .scm-links
+gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
+  gw-gnc-spec.scm .scm-links ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
           "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
            (set! %load-path (cons \"../engine\" %load-path)) \
diff --git a/src/import-export/binary-import/Makefile.am b/src/import-export/binary-import/Makefile.am
index d988584473..15308959c4 100644
--- a/src/import-export/binary-import/Makefile.am
+++ b/src/import-export/binary-import/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = . test
-DIST_SUBDIRS = test
 
 pkglib_LTLIBRARIES = libgncmod-binary-import.la libgw-binary-import.la
 
@@ -81,7 +80,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-binary-import.scm gw-binary-import.c gw-binary-import.h: .scm-links gw-binary-import-spec.scm
+gw-binary-import.scm gw-binary-import.c gw-binary-import.h: \
+  .scm-links gw-binary-import-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/import-export/hbci/test/Makefile.am b/src/import-export/hbci/test/Makefile.am
index 1800147d4c..6df2ff746b 100644
--- a/src/import-export/hbci/test/Makefile.am
+++ b/src/import-export/hbci/test/Makefile.am
@@ -1,4 +1,4 @@
-TESTS=test-link
+TESTS=test-link-module
 
 noinst_PROGRAMS=test-link-module
 
diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am
index 45a7c95af3..84477c63d3 100644
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@@ -89,7 +89,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-register-core.scm gw-register-core.c gw-register-core.h: .scm-links gw-register-core-spec.scm
+gw-register-core.scm gw-register-core.c gw-register-core.h: \
+  .scm-links gw-register-core-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 1c4dbb1305..323f2cc4d6 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -81,7 +81,8 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: .scm-links gw-report-gnome-spec.scm
+gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: \
+  .scm-links gw-report-gnome-spec.scm ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (set! %load-path (cons \"${PWD}\" %load-path)) \