David Hampton's make distcheck patch.

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

Makefile.am

@@ -62,20 +62,21 @@ CLEANFILES = gnucash-config
 ## the sed substitutions.
 make-gnucash-patch: make-gnucash-patch.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PERL-@:${PERL}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 make-gnucash-potfiles: make-gnucash-potfiles.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PERL-@:${PERL}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 DISTCLEANFILES = \
-  cscope.files cscope.out etags.files make-gnucash-patch
+  intltool-extract intltool-update intltool-merge\
+  cscope.files cscope.out etags.files make-gnucash-patch make-gnucash-potfiles
 
 cscope.files:
 	find . -name '*.[ch]' > cscope.files

configure.in

@@ -749,6 +749,7 @@ GNUCASH_REGISTER_CORE_LIBS="${GNUCASH_GNOME_UTILS_LIBS} -lgncmod-register-core"
 AC_SUBST(GNUCASH_REGISTER_CORE_CFLAGS)
 AC_SUBST(GNUCASH_REGISTER_CORE_LIBS)
 
+AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
 
 ### --------------------------------------------------------------------------
 ### Adjustments -- especially executables that aren't generated via
@@ -778,6 +779,7 @@ AC_OUTPUT(
           doc/Makefile
           doc/examples/Makefile
           doc/html/Makefile
+          doc/html/C/Makefile
           doc/html/fr/Makefile
           doc/html/fr/image/Makefile
           doc/sgml/Makefile

doc-tools/Makefile.am

@@ -20,7 +20,7 @@ noinst_DATA = build-help-index
 ## the sed substitutions.
 build-help-index: build-help-index.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PERL-@:${PERL}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@

doc/html/C/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

doc/html/C/Makefile.am

@@ -0,0 +1,7 @@
+docdir = ${GNC_SHAREDIR}/html/C
+
+doc_DATA = \
+  xacc-tax-report-example.html
+
+EXTRA_DIST = \
+  ${doc_DATA}

doc/html/Makefile.am

@@ -1,7 +1,7 @@
 
 docdir = ${GNC_SHAREDIR}/html
 
-SUBDIRS = fr
+SUBDIRS = C fr
 
 doc_DATA = \
   gnucash.css \

doc/sgml/C/Makefile.am

@@ -96,10 +96,23 @@ install-data-local: gnucash/index.html gnucash/help-search-index.db
               $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/$$basefile; \
 	  done)
 
+uninstall-local:
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/topic.dat;
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/help-search-index.db;
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.html; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.css; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/*.gif; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
 
 EXTRA_DIST = \
-	$(GNUCASH_SGML_FILES) \
-	$(GNUCASH_HTML_FILES) \
 	topic.dat
 
 manual-html: gnucash/index.html
@@ -115,16 +128,16 @@ clean:
 	rm -rf gnucash.junk
 
 gnucash/gnucash.dvi: $(GNUCASH_SGML_FILES)
-	db2dvi gnucash.sgml
+	db2dvi ${srcdir}/gnucash.sgml
 
 gnucash/gnucash.ps: $(GNUCASH_SGML_FILES)
-	db2ps gnucash.sgml
+	db2ps ${srcdir}/gnucash.sgml
 
 gnucash/gnucash.rtf: $(GNUCASH_SGML_FILES)
-	db2rtf gnucash.sgml
+	db2rtf ${srcdir}/gnucash.sgml
 
 gnucash/index.html: $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES)
-	-(db2html gnucash.sgml \
+	-(db2html ${srcdir}/gnucash.sgml \
 	  && cp $(GNUCASH_HTML_FILES) gnucash \
 	  && mkdir -p gnucash/image \
 	  && cp $(srcdir)/image/*.png gnucash/image || exit 1) 
@@ -139,7 +152,14 @@ dist-hook:
 	mkdir $(distdir)/gnucash
 	mkdir $(distdir)/gnucash/image
 	mkdir $(distdir)/gnucash/stylesheet-images
-	cp gnucash/*.html $(distdir)/gnucash
+	-(if test -f gnucash.sgml; then dir=.; \
-	cp gnucash/image/*.png $(distdir)/gnucash/image
+	  else dir="${srcdir}"; fi; \
-	-cp gnucash/*.css $(distdir)/gnucash
+	  for file in $(GNUCASH_SGML_FILES); do \
-	-cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images
+	    cp $${dir}/$$file $(distdir)/$$file; \
+	  done)
+	-(if test -f gnucash/index.html; then dir=.; \
+	  else dir="${srcdir}"; fi; \
+	  cp $${dir}/gnucash/*.html $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/image/*.png $(distdir)/gnucash/image; \
+	  cp $${dir}/gnucash/*.css $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images)

doc/sgml/de_DE/Makefile.am

@@ -38,10 +38,23 @@ install-data-local: gnucash/index.html gnucash/help-search-index.db
               $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/$$basefile; \
 	  done)
 
+uninstall-local:
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/topic.dat;
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/help-search-index.db;
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.html; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.css; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/*.gif; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
 
 EXTRA_DIST = \
-	$(GNUCASH_SGML_FILES) \
-	$(GNUCASH_HTML_FILES) \
 	topic.dat
 
 manual-html: gnucash/index.html
@@ -81,7 +94,14 @@ dist-hook:
 	mkdir $(distdir)/gnucash
 	mkdir $(distdir)/gnucash/image
 	mkdir $(distdir)/gnucash/stylesheet-images
-	cp gnucash/*.html $(distdir)/gnucash
+	-(if test -f gnucash.sgml; then dir=.; \
-	-cp gnucash/image/*.png $(distdir)/gnucash/image
+	  else dir="${srcdir}"; fi; \
-	-cp gnucash/*.css $(distdir)/gnucash
+	  for file in $(GNUCASH_SGML_FILES); do \
-	-cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images
+	    cp $${dir}/$$file $(distdir)/$$file; \
+	  done)
+	-(if test -f gnucash/index.html; then dir=.; \
+	  else dir="${srcdir}"; fi; \
+	  cp $${dir}/gnucash/*.html $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/image/*.png $(distdir)/gnucash/image; \
+	  cp $${dir}/gnucash/*.css $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images)

doc/sgml/es/Makefile.am

@@ -76,10 +76,23 @@ install-data-local: gnucash/index.html gnucash/help-search-index.db
               $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/$$basefile; \
 	  done)
 
+uninstall-local:
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/topic.dat;
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/help-search-index.db;
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.html; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.css; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/*.gif; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
 
 EXTRA_DIST = \
-	$(GNUCASH_SGML_FILES) \
-	$(GNUCASH_HTML_FILES) \
 	topic.dat
 
 manual-html: gnucash/index.html
@@ -119,7 +132,14 @@ dist-hook:
 	mkdir $(distdir)/gnucash
 	mkdir $(distdir)/gnucash/image
 	mkdir $(distdir)/gnucash/stylesheet-images
-	cp gnucash/*.html $(distdir)/gnucash
+	-(if test -f gnucash.sgml; then dir=.; \
-	cp gnucash/image/*.png $(distdir)/gnucash/image
+	  else dir="${srcdir}"; fi; \
-	-cp gnucash/*.css $(distdir)/gnucash
+	  for file in $(GNUCASH_SGML_FILES); do \
-	-cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images
+	    cp $${dir}/$$file $(distdir)/$$file; \
+	  done)
+	-(if test -f gnucash/index.html; then dir=.; \
+	  else dir="${srcdir}"; fi; \
+	  cp $${dir}/gnucash/*.html $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/image/*.png $(distdir)/gnucash/image; \
+	  cp $${dir}/gnucash/*.css $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images)

doc/sgml/pt_PT/Makefile.am

@@ -94,10 +94,23 @@ install-data-local: gnucash/index.html gnucash/help-search-index.db
               $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/$$basefile; \
 	  done)
 
+uninstall-local:
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/topic.dat;
+	-rm -f $(DESTDIR)$(gnucash_helpdir)/help-search-index.db;
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.html; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/*.css; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
+	-(for file in $(DESTDIR)$(gnucash_helpdir)/stylesheet-images/*.gif; do \
+	    echo " rm -f $$file"; \
+	    rm -f $$file; \
+	  done)
 
 EXTRA_DIST = \
-	$(GNUCASH_SGML_FILES) \
-	$(GNUCASH_HTML_FILES) \
 	topic.dat
 
 manual-html: gnucash/index.html
@@ -137,7 +150,14 @@ dist-hook:
 	mkdir $(distdir)/gnucash
 	mkdir $(distdir)/gnucash/image
 	mkdir $(distdir)/gnucash/stylesheet-images
-	cp gnucash/*.html $(distdir)/gnucash
+	-(if test -f gnucash.sgml; then dir=.; \
-	cp gnucash/image/*.png $(distdir)/gnucash/image
+	  else dir="${srcdir}"; fi; \
-	-cp gnucash/*.css $(distdir)/gnucash
+	  for file in $(GNUCASH_SGML_FILES); do \
-	-cp gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images
+	    cp $${dir}/$$file $(distdir)/$$file; \
+	  done)
+	-(if test -f gnucash/index.html; then dir=.; \
+	  else dir="${srcdir}"; fi; \
+	  cp $${dir}/gnucash/*.html $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/image/*.png $(distdir)/gnucash/image; \
+	  cp $${dir}/gnucash/*.css $(distdir)/gnucash; \
+	  cp $${dir}/gnucash/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images)

po/POTFILES.in

@@ -102,8 +102,6 @@ src/business/business-core/gncEntry.c
 src/business/business-core/gncInvoice.c
 src/business/business-core/gncOrder.c
 src/business/business-core/gncOwner.c
-src/business/business-gnome/business-chooser.c
-src/business/business-gnome/business-chooser.glade
 src/business/business-gnome/businessmod-gnome.c
 src/business/business-gnome/customer.glade
 src/business/business-gnome/dialog-customer.c

rpm/Makefile.am

@@ -11,7 +11,7 @@ all-local: gnucash.spec
 ## the sed substitutions.  *sigh*
 gnucash.spec: gnucash.spec.in Makefile
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-VERSION-@:${VERSION}:'
 	mv $@.tmp $@
 

src/app-file/Makefile.am

@@ -46,20 +46,30 @@ noinst_DATA = .scm-links
 EXTRA_DIST = \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-app-file-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gw-app-file.scm gw-app-file.c gw-app-file.h: .scm-links gw-app-file-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)) \
+	  (set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
 	  (primitive-load \"./gw-app-file-spec.scm\") \
 	  (gw:generate-wrapset \"gw-app-file\")"
 
 BUILT_SOURCES = gw-app-file.scm gw-app-file.c gw-app-file.h
-CLEANFILES = gw-app-file.scm gw-app-file.c gw-app-file.h gw-app-file.html \
+CLEANFILES = ${BUILT_SOURCES} gw-app-file.html \
-              gnucash g-wrapped .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links

src/app-file/test/Makefile.am

@@ -6,11 +6,16 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/app-file \
+  --gnc-module-dir ${top_builddir}/src/gnome-utils \
+  --gnc-module-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
   --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_builddir}/src/gnome \
   --guile-load-dir ${top_srcdir}/src/gnome-utils \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
   --library-dir    ${top_srcdir}/src/gnome \
   --library-dir    ${top_srcdir}/src/gnome-utils
 
@@ -22,5 +27,8 @@ noinst_PROGRAMS = test-link
 test_link_SOURCES = test-link.c
 test_link_LDADD = ../libgncmod-app-file.la 
 
+EXTRA_DIST = \
+  test-load-module
+
 testit: 
 	${TESTS_ENVIRONMENT} gdb guile

src/app-utils/Makefile.am

@@ -44,9 +44,9 @@ gncinclude_HEADERS = \
 libgncmod_app_utils_la_LDFLAGS = -module
 
 libgncmod_app_utils_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgncmod-calculation.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
@@ -84,7 +84,7 @@ EXTRA_DIST = \
 ## the sed substitutions.
 i18n.h: i18n.h.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PACKAGE-@:${PACKAGE}:g' \
             -e 's:@-LOCALE_DIR-@:${LOCALE_DIR}:g'
 	mv $@.tmp $@
@@ -92,20 +92,32 @@ i18n.h: i18n.h.in
 # but it's never a target itself.
 BUILT_SOURCES = i18n.h
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-app-utils-spec.scm
+#For executing test cases
+SCM_FILE_LINKS += app-utils.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gw-app-utils.scm gw-app-utils.c gw-app-utils.h: .scm-links gw-app-utils-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)) \
+	  (set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
 	  (primitive-load \"./gw-app-utils-spec.scm\") \
 	  (gw:generate-wrapset \"gw-app-utils\")"
 
 BUILT_SOURCES += gw-app-utils.scm gw-app-utils.c gw-app-utils.h
 CLEANFILES = ${BUILT_SOURCES} gw-app-utils.html \
-              gnucash g-wrapped .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links

src/app-utils/test/Makefile.am

@@ -10,12 +10,15 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
+  --gnc-module-dir ${top_srcdir}/src/engine \
+  --gnc-module-dir ${top_srcdir}/src/app-utils \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
-  --guile-load-dir ${top_srcdir}/src/gnome-utils \
+  --guile-load-dir ${top_builddir}/src/scm \
-  --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_srcdir}/src/gnome-utils \
+  --guile-load-dir ${top_builddir}/src/gnome \
+  --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${top_srcdir}/src/gnome
 
 TESTS_ENVIRONMENT := \
@@ -26,8 +29,8 @@ LDADD = \
    ../../gnc-module/libgncmodule.la \
    ../libgncmod-app-utils.la \
    ../../engine/libgw-engine.la \
-   ${top_srcdir}/src/test-core/libgncmod-test.la \
+   ${top_builddir}/src/test-core/libgncmod-test.la \
-   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la 
+   ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la 
 
 noinst_PROGRAMS = \
   test-link-module \
@@ -42,5 +45,5 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \
-  -I.. \
+  -I${top_srcdir}/src/app-utils \
   ${GLIB_CFLAGS}

src/backend/file/Makefile.am

@@ -4,8 +4,9 @@ pkglib_LTLIBRARIES = libgncmod-backend-file.la
 
 AM_CFLAGS = \
   -I.. -I../.. \
-  -I../../engine \
+  -I${top_srcdir}/src/backend \
-  -I../../gnc-module \
+  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/src/gnc-module \
   ${GLIB_CFLAGS}
 
 libgncmod_backend_file_la_SOURCES = \
@@ -50,4 +51,4 @@ noinst_HEADERS = \
 libgncmod_backend_file_la_LDFLAGS = -module
 libgncmod_backend_file_la_LIBADD = \
    ${GLIB_LIBS} ${GNOME_XML_LIB} \
-   ${top_srcdir}/src/engine/libgncmod-engine.la 
+   ${top_builddir}/src/engine/libgncmod-engine.la 

src/backend/file/test/Makefile.am

@@ -19,9 +19,14 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/backend/file \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR}
 
 TESTS_ENVIRONMENT := \
+  GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
+  GNC_TEST_FILES=${srcdir}/test-files/xml2 \
+  SRCDIR=${srcdir} \
   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_LTLIBRARIES = libgnc-test-file-stuff.la
@@ -44,13 +49,13 @@ noinst_PROGRAMS = \
 
 noinst_HEADERS = test-file-stuff.h
 
-LDADD = ${top_srcdir}/src/test-core/libgncmod-test.la \
+LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
-        ${top_srcdir}/src/gnc-module/libgncmodule.la \
+        ${top_builddir}/src/gnc-module/libgncmodule.la \
-        ${top_srcdir}/src/engine/libgncmod-engine.la \
+        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_srcdir}/src/engine/libgw-engine.la \
+        ${top_builddir}/src/engine/libgw-engine.la \
-        ${top_srcdir}/src/engine/libgw-kvp.la \
+        ${top_builddir}/src/engine/libgw-kvp.la \
-        ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
+        ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-        ../libgncmod-backend-file.la \
+        ${top_builddir}/src/backend/file/libgncmod-backend-file.la \
         ./libgnc-test-file-stuff.la 
 
 AM_CFLAGS = \
@@ -59,7 +64,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \
-  -I.. \
+  -I${top_srcdir}/src/backend/file \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}
 
@@ -67,4 +72,5 @@ EXTRA_DIST = \
   grab-types.pl \
   test-dom-parser1.c \
   test-load-module \
-  test-real-data.sh
+  test-real-data.sh \
+  test-xml2-is-file.c

src/backend/file/test/test-load-example-account.c

@@ -44,11 +44,16 @@ test_load_file(GNCBook *book, const char *filename)
 static void
 guile_main(int argc, char **argv)
 {
-    const char *location = "../../../../accounts/C";
+    const char *location = getenv("GNC_ACCOUNT_PATH");
     GSList *list = NULL;
     DIR *ea_dir;
     GNCBook *book;
 
+    if (!location)
+    {
+	location = "../../../../accounts/C";
+    }
+
     gnc_module_system_init();
     gnc_module_load("gnucash/engine", 0);
 

src/backend/file/test/test-load-xml2.c

@@ -53,7 +53,7 @@ test_load_file(const char *filename)
 
     remove_locks(filename);
 
-    gnc_session_begin(session, filename, FALSE, FALSE);
+    gnc_session_begin(session, filename, TRUE, FALSE);
 
     gnc_session_load_from_xml_file_v2(session, NULL);
 
@@ -73,9 +73,14 @@ test_load_file(const char *filename)
 static void
 guile_main(int argc, char **argv)
 {
-    const char *location = "test-files/xml2";
+    const char *location = getenv("GNC_TEST_FILES");
     DIR *xml2_dir;
 
+    if (!location)
+    {
+	location = "test-files/xml2";
+    }
+
     gnc_module_system_init();
     gnc_module_load("gnucash/engine", 0);
 

src/backend/file/test/test-real-data.sh

@@ -4,7 +4,7 @@
 
 EXIT_VALUE=0
 
-for i in test-files/xml2/*.gml2 ; do
+for i in $SRCDIR/test-files/xml2/*.gml2 ; do
 
   if [ ! -d $i ] ; then
     for j in account commodity transaction ; do
@@ -12,9 +12,9 @@ for i in test-files/xml2/*.gml2 ; do
       rm -rf $j
       
       mkdir $j
-      FILES=`perl grab-types.pl "gnc:$j" $i "$j/dataXXX.xml"`
+      FILES=`perl $SRCDIR/grab-types.pl "gnc:$j" $i "$j/dataXXX.xml"`
       if [ ! -z "$FILES" ] ; then
-        echo "Testing file $i, section $j"
+        echo "Testing file `basename $i`, section $j"
       
         eval "./test-xml-$j $FILES"
         if [ $? != 0 ] ; then

src/backend/file/test/test-xml2-is-file.c

@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <string.h>
 
 #include "io-gncxml-v2.h"
 
@@ -6,12 +7,22 @@
 #include "test-engine-stuff.h"
 #include "test-file-stuff.h"
 
+#define FILENAME "Money95bank_fr.gml2"
+
 int
 main(int argc, char **argv)
 {
-    do_test(
+    const char *directory = getenv("GNC_TEST_FILES");
-        gnc_is_xml_data_file_v2("test-files/xml2/Money95bank_fr.gml2"),
+    char *filename;
-        "gnc_is_xml_data_file_v2" );
+
+    if (!directory)
+    {
+	directory = "../../../../accounts/C";
+    }
+
+    filename = malloc(strlen(directory) + 1 + strlen(FILENAME) + 1);
+    sprintf(filename, "%s/%s", directory, FILENAME);
+    do_test(gnc_is_xml_data_file_v2(filename), "gnc_is_xml_data_file_v2");
 
     print_test_results();
     exit(get_rv());

src/backend/net/Makefile.am

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

src/backend/postgres/Makefile.am

@@ -5,7 +5,7 @@ pkglib_LTLIBRARIES = libgncmod-backend-postgres.la
 libgncmod_backend_postgres_la_LDFLAGS = -module 
 
 libgncmod_backend_postgres_la_LIBADD  =  -lpq  \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
   ${GLIB_LIBS}
 
 libgncmod_backend_postgres_la_SOURCES = \

src/backend/postgres/test/Makefile.am

@@ -19,15 +19,15 @@ noinst_PROGRAMS = \
   test-escape \
   test-period
 
-LDADD = ${top_srcdir}/src/test-core/libgncmod-test.la \
+LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
-        ${top_srcdir}/src/gnc-module/libgncmodule.la \
+        ${top_builddir}/src/gnc-module/libgncmodule.la \
-        ${top_srcdir}/src/engine/libgncmod-engine.la \
+        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_srcdir}/src/engine/libgncmod-engine.la \
+        ${top_builddir}/src/engine/libgncmod-engine.la \
-        ${top_srcdir}/src/engine/libgw-engine.la \
+        ${top_builddir}/src/engine/libgw-engine.la \
-        ${top_srcdir}/src/engine/libgw-kvp.la \
+        ${top_builddir}/src/engine/libgw-kvp.la \
-        ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
+        ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-	${top_srcdir}/src/backend/postgres/libgncmod-backend-postgres.la \
+	${top_builddir}/src/backend/postgres/libgncmod-backend-postgres.la \
-	${top_srcdir}/src/backend/file/libgncmod-backend-file.la \
+	${top_builddir}/src/backend/file/libgncmod-backend-file.la \
         -lltdl
 
 AM_CFLAGS = \
@@ -40,5 +40,6 @@ AM_CFLAGS = \
   ${GUILE_INCS} 
 
 EXTRA_DIST = \
+  test-load-module \
   db-control.sh
 

src/bin/Makefile.am

@@ -27,6 +27,6 @@ EXTRA_DIST = .cvsignore generate-gnc-script
 
 ## Gnucash scripts -- real code is in overrides, these just get you there.
 ${gnc_common_scripts}: generate-gnc-script
-	./generate-gnc-script $@ "${gncoverridesdir}"
+	${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
 
 CLEANFILES = ${gnc_common_scripts}

src/bin/overrides/Makefile.am

@@ -27,7 +27,7 @@ PWD := $(shell pwd)
 
 guile: guile.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
 	    -e 's:@-GUILE-@:${GUILE}:'
 	mv $@.tmp $@
 	chmod u+x $@
@@ -36,7 +36,7 @@ CLEANFILES = guile
 
 gnucash-env: gnucash-env.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
 	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
 	    -e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
 	    -e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
@@ -51,7 +51,7 @@ CLEANFILES += gnucash-env
 
 gnucash-build-env: gnucash-build-env.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
 	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
             -e 's:@-GNC_BUILDDIR-@:${PWD}/${top_builddir}:g' \
             -e 's:@-GNC_SRCDIR-@:${PWD}/${top_srcdir}:g'

src/bin/test/Makefile.am

@@ -6,7 +6,9 @@ TESTS = test-version test-run-script test-guile-env-override
 # arrangement as possible.
 
 TEST_PWD := $(shell pwd)
-TESTS_ENVIRONMENT=PATH="${TEST_PWD}/overrides:${PATH}"
+TESTS_ENVIRONMENT := \
+  SRCDIR=${srcdir} \
+  PATH="${TEST_PWD}/overrides:${PATH}"
 
 noinst_DATA = overrides.stamp
 
@@ -23,3 +25,5 @@ CLEANFILES = overrides.stamp
 
 clean-local:
 	rm -rf overrides
+EXTRA_DIST = \
+  fake-guile test-version test-run-script test-guile-env-override

src/bin/test/test-guile-env-override

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GNC_GUILE=`pwd`/fake-guile
+GNC_GUILE=$SRCDIR/fake-guile
 export GNC_GUILE
 
 gnucash-env guile

src/business/business-core/Makefile.am

@@ -70,10 +70,22 @@ EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-business-core-spec.scm
+#For executing test cases
+SCM_FILE_LINKS += business-core.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gncmod-business-core.c: gw-business-core.h
@@ -87,4 +99,5 @@ gw-business-core.scm gw-business-core.c gw-business-core.h: .scm-links gw-busine
 	 (gw:generate-wrapset \"gw-business-core\")"
 
 BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h
-CLEANFILES = gw-business-core.scm gw-business-core.c gw-business-core.h gw-business-core.html
+CLEANFILES = ${BUILT_SOURCES} gw-business-core.html \
+             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links

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

@@ -3,15 +3,15 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
-  -I.. \
+  -I${top_srcdir}/src/business/business-core \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} 
 
 LDADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libgncmod-test.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/engine/libgw-engine.la \
+  ${top_builddir}/src/engine/libgw-engine.la \
   ../libgncmod-business-core.la \
   ../libgw-business-core.la \
   ${GLIB_LIBS} \
@@ -30,6 +30,8 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/business/business-core \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR}
 
 TESTS_ENVIRONMENT := \

src/business/business-gnome/Makefile.am

@@ -51,8 +51,8 @@ noinst_HEADERS = \
 libgncmod_business_gnome_la_LDFLAGS = -module
 
 libgncmod_business_gnome_la_LIBADD = \
-  ../business-ledger/libgnc-business-ledger.la \
+  ${top_builddir}/src/business/business-ledger/libgnc-business-ledger.la \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GUILE_LIBS} \
   ${GNOMEUI_LIBS} \
   ${G_WRAP_LINK_ARGS} \
@@ -87,10 +87,20 @@ EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-business-gnome-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gncmod-business-gnome.c: gw-business-gnome.h
@@ -107,4 +117,7 @@ gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: .scm-links gw-bus
 	 (gw:generate-wrapset \"gw-business-gnome\")"
 
 BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
-CLEANFILES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h gw-business-gnome.html
+CLEANFILES = ${BUILT_SOURCES} gw-business-gnome.html \
+             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links
+
+

src/business/business-ledger/Makefile.am

@@ -19,13 +19,13 @@ noinst_HEADERS = \
 
 libgnc_business_ledger_la_LDFLAGS = -module
 libgnc_business_ledger_la_LIBADD = \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_srcdir}/src/register/register-gnome/libgncmod-register-gnome.la
+  ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la
 
 AM_CFLAGS = \
-  -I../business-core \
+  -I${top_srcdir}/src/business/business-core \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \

src/core-utils/Makefile.am

@@ -18,12 +18,21 @@ EXTRA_DIST = .cvsignore gw-core-utils-spec.scm
 
 AM_CFLAGS = ${G_WRAP_COMPILE_ARGS} ${GLIB_CFLAGS} ${GUILE_INCS}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-core-utils-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
-DISTCLEANFILES = .scm-links gnucash g-wrapped
 
 gw-core-utils.scm gw-core-utils.h gw-core-utils.c gw-core-utils.html: \
   gw-core-utils-spec.scm .scm-links
@@ -31,5 +40,7 @@ gw-core-utils.scm gw-core-utils.h gw-core-utils.c gw-core-utils.html: \
           "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
            (primitive-load \"./gw-core-utils-spec.scm\") \
            (gw:generate-wrapset \"gw-core-utils\")"
+
 BUILT_SOURCES = gw-core-utils.scm gw-core-utils.h gw-core-utils.c
-CLEANFILES = gw-core-utils.scm gw-core-utils.h gw-core-utils.c 
+CLEANFILES = ${BUILT_SOURCES} gw-core-utils.html \
+             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links

src/doc/design/Makefile.am

@@ -14,3 +14,7 @@ gnucash_design_TEXINFOS = \
   user-preferences.texinfo
 
 CLEANFILES = gnucash-design.info gnucash-design.info-[0-9]*
+
+# These should included as part of the automake rule set.  Perhaps I
+# have a version skew between automake and texinfo.
+DISTCLEANFILES = gnucash-design.cps gnucash-design.fns gnucash-design.tps

src/engine/Makefile.am

@@ -100,9 +100,9 @@ noinst_SCRIPTS = iso-currencies-to-c
 
 libgncmod_engine_la_LDFLAGS = -module
 libgncmod_engine_la_LIBADD = ${GNUCASH_ENGINE_BASE_LIBS} \
- ${top_srcdir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgncmodule.la \
- ${top_srcdir}/src/engine/libgw-engine.la \
+ ${top_builddir}/src/engine/libgw-engine.la \
- ${top_srcdir}/src/engine/libgw-kvp.la 
+ ${top_builddir}/src/engine/libgw-kvp.la 
 
 libgw_kvp_la_SOURCES = gw-kvp.c kvp-scm.c
 libgw_kvp_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
@@ -140,19 +140,31 @@ EXTRA_DIST = \
   ${gncscm_DATA} \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-engine-spec.scm gw-kvp-spec.scm iso-4217-currencies.scm
+#For executing test cases
+SCM_FILE_LINKS += engine.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gncmod-engine.c: gw-engine.h
 
 gnc-commodity.c: iso-4217-currencies.c
 
-iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
+iso-4217-currencies.c: .scm-links iso-4217-currencies.scm iso-currencies-to-c
-	chmod u+x ./iso-currencies-to-c
+	chmod u+x ${srcdir}/iso-currencies-to-c
-	GUILE_LOAD_PATH=${top_srcdir}/lib/ ./iso-currencies-to-c
+	GUILE_LOAD_PATH=${top_srcdir}/lib/ ${srcdir}/iso-currencies-to-c
 
 gw-engine.scm gw-engine.c gw-engine.h: .scm-links gw-engine-spec.scm
 	FLAVOR=gnome guile -c \
@@ -168,4 +180,9 @@ gw-kvp.scm gw-kvp.c gw-kvp.h: .scm-links gw-kvp-spec.scm
 	 (primitive-load \"./gw-kvp-spec.scm\") \
 	 (gw:generate-wrapset \"gw-kvp\")"
 
-CLEANFILES = gw-engine.scm gw-engine.c gw-engine.h gw-engine.html gnucash g-wrapped .scm-links gw-kvp.scm gw-kvp.c gw-kvp.h iso-4217-currencies.c
+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 \
+             iso-4217-currencies.c \
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links

src/engine/test-core/Makefile.am

@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES=libgncmod-test-engine.la
 
 LDADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ../libgncmod-engine.la \
   ${GLIB_LIBS} \
   -lltdl
@@ -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 = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-engine-stuff.h

src/engine/test/Makefile.am

@@ -2,14 +2,14 @@
 AM_CFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
-  -I.. \
+  -I${top_srcdir}/src/engine \
-  -I../test-core \
+  -I${top_srcdir}/src/engine/test-core \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} 
 
 LDADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/test-core/libgncmod-test.la \
+  ${top_builddir}/src/test-core/libgncmod-test.la \
   ../libgncmod-engine.la \
   ../libgw-engine.la \
   ../libgw-kvp.la \
@@ -36,9 +36,13 @@ TESTS = \
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
+  --guile-load-dir ${top_srcdir}/src/engine/test \
   --guile-load-dir ${G_WRAP_MODULE_DIR}
 
 TESTS_ENVIRONMENT := \
+  SRCDIR=${srcdir} \
   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_PROGRAMS = \
@@ -59,3 +63,8 @@ noinst_PROGRAMS = \
 EXTRA_DIST = \
   test-create-account \
   test-create-account.scm
+
+clean:
+	rm translog.*
+
+distclean-local: clean

src/engine/test/test-create-account

@@ -1,2 +1,2 @@
 #!/bin/sh
-guile -l test-create-account.scm -c "(exit (run-test))"
+guile -l $SRCDIR/test-create-account.scm -c "(exit (run-test))"

src/gnc-module/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = . test
 
-AM_CFLAGS = -I../core-utils ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}
+AM_CFLAGS = -I${top_srcdir}/src/core-utils ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}
 
 lib_LTLIBRARIES = libgncmodule.la 
 pkglib_LTLIBRARIES = libgw-gnc-module.la
@@ -37,20 +37,33 @@ EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-gnc-module-spec.scm
+#For executing test cases
+SCM_FILE_LINKS += gnc-module.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash
 	ln -sf . g-wrapped
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gnc-module.c: gw-gnc-module.h
 
-gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: gw-gnc-module-spec.scm
+gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: .scm-links gw-gnc-module-spec.scm
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
 	  (primitive-load \"./gw-gnc-module-spec.scm\") \
 	  (gw:generate-wrapset \"gw-gnc-module\")"
 
 BUILT_SOURCES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c
-CLEANFILES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c gw-gnc-module.html g-wrapped \
+CLEANFILES = ${BUILT_SOURCES} gw-gnc-module.html \
-gnucash .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+

src/gnc-module/test/Makefile.am

@@ -2,7 +2,10 @@ SUBDIRS = mod-foo mod-bar mod-baz misc-mods
 
 LDADD = ../libgncmodule.la ${GLIB_LIBS} -lltdl
 
-AM_CFLAGS = ${GLIB_CFLAGS} -I../ ${GUILE_INCS}
+AM_CFLAGS = \
+  -I${top_srcdir}/src/gnc-module \
+  ${GUILE_INCS} \
+  ${GLIB_CFLAGS}
 
 TESTS = \
   test-load-c \
@@ -24,6 +27,11 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-bar \
   --gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-baz \
   --gnc-module-dir ${top_builddir}/src/gnc-module/test/misc-mods \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module/test/misc-mods \
   --guile-load-dir ${G_WRAP_MODULE_DIR}
 
 TESTS_ENVIRONMENT := \

src/gnc-module/test/misc-mods/Makefile.am

@@ -1,4 +1,6 @@
-AM_CFLAGS = ${GLIB_CFLAGS} -I../../
+AM_CFLAGS = \
+  -I${top_srcdir}/src/gnc-module \
+  ${GLIB_CFLAGS}
 
 LDADD = -L../.. -L../../.libs
 

src/gnc-module/test/mod-bar/Makefile.am

@@ -1,5 +1,5 @@
 AM_CFLAGS = \
-  -I../.. \
+  -I${top_srcdir}/src/gnc-module \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
@@ -23,7 +23,7 @@ EXTRA_DIST = \
 bar-gwrap.c bar-gwrap.h: bar-gwrap.scm
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-	  (primitive-load \"./bar-gwrap.scm\") \
+	  (primitive-load \"${srcdir}/bar-gwrap.scm\") \
 	  (gw:generate-wrapset \"bar-gwrap\")"
 
 BUILT_SOURCES = bar-gwrap.c bar-gwrap.h

src/gnc-module/test/mod-baz/Makefile.am

@@ -1,6 +1,6 @@
 AM_CFLAGS = \
-  -I../.. \
+  -I${top_srcdir}/src/gnc-module \
-  -I../mod-foo \
+  -I${top_srcdir}/src/gnc-module/test/mod-foo \
   ${GLIB_CFLAGS} \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS}
@@ -28,7 +28,7 @@ EXTRA_DIST = \
 baz-gwrap.c baz-gwrap.h: baz-gwrap.scm
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-	  (primitive-load \"./baz-gwrap.scm\") \
+	  (primitive-load \"${srcdir}/baz-gwrap.scm\") \
 	  (gw:generate-wrapset \"baz-gwrap\")"
 
 BUILT_SOURCES = baz-gwrap.c baz-gwrap.h

src/gnc-module/test/mod-foo/Makefile.am

@@ -23,7 +23,7 @@ EXTRA_DIST = \
 foo-gwrap.c foo-gwrap.h: foo-gwrap.scm
 	FLAVOR=gnome guile -c \
 	  "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-           (primitive-load \"./foo-gwrap.scm\") \
+           (primitive-load \"${srcdir}/foo-gwrap.scm\") \
            (gw:generate-wrapset \"foo-gwrap\")"
 
 BUILT_SOURCES = foo-gwrap.c foo-gwrap.h

src/gnome-search/Makefile.am

@@ -28,6 +28,10 @@ libgncmod_gnome_search_la_SOURCES = \
   search-param.c \
   search-string.c
 
+gncincludedir = ${GNC_INCLUDE_DIR}
+gncinclude_HEADERS = \
+  dialog-search.h
+
 noinst_HEADERS = \
   search-account.h \
   search-boolean.h \
@@ -42,7 +46,7 @@ noinst_HEADERS = \
 libgncmod_gnome_search_la_LDFLAGS = -module
 
 libgncmod_gnome_search_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBDIR} \
   ${GNOMEUI_LIBS} \
@@ -71,10 +75,20 @@ EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-gnome-search-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gncmod-gnome-search.c: gw-gnome-search.h
@@ -90,4 +104,5 @@ gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h: .scm-links gw-gnome-sea
 	 (gw:generate-wrapset \"gw-gnome-search\")"
 
 BUILT_SOURCES = gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h
-CLEANFILES = gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h gw-gnome-search.html
+CLEANFILES = ${BUILT_SOURCES} gw-gnome-search.html \
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links

src/gnome-utils/Makefile.am

@@ -77,11 +77,11 @@ noinst_HEADERS = \
 libgncmod_gnome_utils_la_LDFLAGS = -module
 
 libgncmod_gnome_utils_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgncmod-calculation.la \
-  ${top_srcdir}/src/network-utils/libgncmod-network-utils.la \
+  ${top_builddir}/src/network-utils/libgncmod-network-utils.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${GUILE_LIBS} \
   ${GUPPI_LIBS} \
   ${GNOMEUI_LIBS} \
@@ -126,7 +126,7 @@ dialog-utils.c: gnc-dir.h
 ## the sed substitutions.
 gnc-dir.h: gnc-dir.h.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
 	    -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' \
 	    -e 's:@-GNC_GLADE_DIR-@:${GNC_GLADE_DIR}:g' \
 	    -e 's:@-GNC_PIXMAP_DIR-@:${GNC_PIXMAP_DIR}:g'
@@ -139,21 +139,33 @@ BUILT_SOURCES = gnc-dir.h
 dist-hook:
 	rm ${distdir}/gnc-dir.h
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-gnome-utils-spec.scm
+#For executing test cases
+SCM_FILE_LINKS += gnome-utils-spec.scm gnome-utils.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: .scm-links gw-gnome-utils-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)) \
+	  (set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
-	  (set! %load-path (cons \"${top_srcdir}/src/app-utils\" %load-path)) \
+	  (set! %load-path (cons \"${top_builddir}/src/app-utils\" %load-path)) \
 	  (primitive-load \"./gw-gnome-utils-spec.scm\") \
 	  (gw:generate-wrapset \"gw-gnome-utils\")"
 
 BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h
-CLEANFILES = ${BUILT_SOURCES} \
+CLEANFILES = ${BUILT_SOURCES} gw-gnome-utils.html \
-             gw-gnome-utils.html gnucash g-wrapped .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links

src/gnome-utils/test/Makefile.am

@@ -8,10 +8,15 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
+  --gnc-module-dir ${top_builddir}/src/gnome \
+  --gnc-module-dir ${top_builddir}/src/scm \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
   --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/engine \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${top_srcdir}/src/gnome-utils \
   --library-dir    ${top_srcdir}/src/gnome
 
 TESTS_ENVIRONMENT := \
@@ -20,12 +25,14 @@ TESTS_ENVIRONMENT := \
 noinst_PROGRAMS = \
   test-link-module
 
-INCLUDES=-I../../gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
+INCLUDES=-I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
 
 test_link_module_SOURCES=test-link-module.c
 test_link_module_LDADD= \
 ../../gnc-module/libgncmodule.la 
 
+EXTRA_DIST = \
+  test-load-module
 
 testit:
 	libtool --mode execute gdb test-link-module

src/gnome/Makefile.am

@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libgncgnome.la libgw-gnc.la
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm
+#nodist_gwmod_DATA = gw-gnc.scm
 
 libgncgnome_la_LDFLAGS = -module
 libgncgnome_la_LIBADD = \
@@ -92,7 +93,7 @@ EXTRA_DIST = \
   gnucash.desktop.in \
   gnucash.keys.in \
   gnucash.mime \
-  ${gwmod_DATA}
+  gw-gnc-spec.scm
 
 
 AM_CFLAGS = \
@@ -136,19 +137,30 @@ AM_CFLAGS = \
 ## the sed substitutions.
 gnucash.keys: gnucash.keys.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-icondir-@:${appicondir}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 noinst_DATA = .scm-links
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For compiling
+SCM_FILE_LINKS = gw-gnc-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
-DISTCLEANFILES = .scm-links gnucash g-wrapped
+
+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
 	FLAVOR=gnome guile -c \
@@ -160,4 +172,4 @@ gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: gw-gnc-spec.scm .scm-links
            (primitive-load \"./gw-gnc-spec.scm\") \
            (gw:generate-wrapset \"gw-gnc\")"
 BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
-CLEANFILES = gw-gnc.scm gw-gnc.h gw-gnc.c 
+CLEANFILES = ${BUILT_SOURCES} gw-gnc.html gnucash.keys gnucash.desktop

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

@@ -19,7 +19,7 @@ AM_CFLAGS = \
 
 #FIXME remove the following deps
 #  -I${top_srcdir}/src \
-#  -I${top_srcdir}/src/gnome \
+#  -I${top_srcdir}/src/gnome
 
 libgncmod_binary_import_la_SOURCES = \
   druid-commodity.c \
@@ -32,12 +32,12 @@ gncinclude_HEADERS = \
 libgncmod_binary_import_la_LDFLAGS = -module
 
 libgncmod_binary_import_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/calculation/libgncmod-calculation.la \
+  ${top_builddir}/src/calculation/libgncmod-calculation.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_srcdir}/src/app-file/libgncmod-app-file.la \
+  ${top_builddir}/src/app-file/libgncmod-app-file.la \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${GUILE_LIBS} \
   ${GLADE_LIBS} \
   ${GNOMEUI_LIBS} \
@@ -64,14 +64,22 @@ EXTRA_DIST = \
   ${gwmod_DATA} \
   ${glade_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-binary-import-spec.scm
+endif
+
 .scm-links: 
 	rm -f import-export gnucash g-wrapped
 	ln -sf . import-export
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
-CLEANFILES = import-export gnucash g-wrapped .scm-links
-
 
 gw-binary-import.scm gw-binary-import.c gw-binary-import.h: .scm-links gw-binary-import-spec.scm
 	FLAVOR=gnome guile -c \
@@ -81,4 +89,6 @@ gw-binary-import.scm gw-binary-import.c gw-binary-import.h: .scm-links gw-binary
 	  (gw:generate-wrapset \"gw-binary-import\")"
 
 BUILT_SOURCES = gw-binary-import.scm gw-binary-import.c gw-binary-import.h
-CLEANFILES += gw-binary-import.scm gw-binary-import.c gw-binary-import.h gw-binary-import.html
+CLEANFILES = ${BUILT_SOURCES} gw-binary-import.html \
+             ${SCM_FILE_LINKS} gnucash g-wrapped import-export .scm-links
+

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

@@ -14,10 +14,10 @@ noinst_HEADERS = \
 libgncmod_qif_import_la_LDFLAGS = -module 
 
 libgncmod_qif_import_la_LIBADD = \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_srcdir}/src/app-file/libgncmod-app-file.la \
+  ${top_builddir}/src/app-file/libgncmod-app-file.la \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \

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

@@ -1,4 +1,4 @@
-LDADD=${top_srcdir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS} -lltdl
+LDADD=${top_builddir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS} -lltdl
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS} 
 

src/network-utils/Makefile.am

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

src/network-utils/test/Makefile.am

@@ -16,7 +16,7 @@ noinst_PROGRAMS = \
 test_link_module_SOURCES=test-link-module.c
 test_link_module_LDADD=../libgncmod-network-utils.la
 
-#EXTRA_DIST = test-load-module
+EXTRA_DIST = test-load-module
 
 AM_CFLAGS = \
   -I${top_srcdir}/src/test-core \

src/optional/swig/Makefile.am

@@ -94,13 +94,13 @@ gnucash.engine.i: ${SWIG_INPUT_HDRS} perl5_typemaps.i
 CLEANFILES = gnucash.engine.i
 
 gnucash.engine_wrap.doc gnucash-engine-perl5_wrap_int.c: gnucash.engine.i
-	${SWIG} -perl5 -I.. -I${top_srcdir}/src/engine -o $@ gnucash.engine.i
+	${SWIG} -perl5 -I.. -I${srcdir} -I${top_srcdir}/src/engine -o $@ gnucash.engine.i
 
 CLEANFILES += gnucash.engine_wrap.doc gnucash-engine-perl5_wrap_int.c
 
 gnucash-engine-perl5_wrap.c: gnucash-swig-defines.c \
                              gnucash-engine-perl5_wrap_int.c
-	cat gnucash-swig-defines.c gnucash-engine-perl5_wrap_int.c > $@
+	cat $^ > $@
 
 CLEANFILES += gnucash-engine-perl5_wrap.c
 

src/quotes/Makefile.am

@@ -18,7 +18,7 @@ EXTRA_DIST = \
 ## the sed substitutions.
 finance-quote-helper: finance-quote-helper.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PERL-@:${PERL}:g' \
             -e 's:@-PERLINCL-@:${PERLINCL}:g'
 	chmod +x $@.tmp
@@ -27,7 +27,7 @@ CLEANFILES = finance-quote-helper
 
 update-finance-quote: update-finance-quote.in
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-PERL-@:${PERL}:g' \
             -e 's:@-PERLINCL-@:${PERLINCL}:g'
 	chmod +x $@.tmp

src/register/ledger-core/Makefile.am

@@ -25,11 +25,11 @@ noinst_HEADERS = \
 
 libgncmod_ledger_core_la_LDFLAGS = -module
 libgncmod_ledger_core_la_LIBADD = \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_srcdir}/src/register/register-gnome/libgncmod-register-gnome.la \
+  ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
-  ${top_srcdir}/src/dialog-account/libdialog-account.la
+  ${top_builddir}/src/dialog-account/libdialog-account.la
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \

src/register/register-core/Makefile.am

@@ -4,10 +4,10 @@ pkglib_LTLIBRARIES = libgncmod-register-core.la libgw-register-core.la
 
 libgncmod_register_core_la_LDFLAGS = -module
 libgncmod_register_core_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${GLIB_LIBS}
 
 libgncmod_register_core_la_SOURCES = \
@@ -70,6 +70,23 @@ AM_CFLAGS = \
   ${GLIB_CFLAGS}
 
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-register-core-spec.scm
+endif
+
+.scm-links: 
+	rm -f gnucash g-wrapped
+	ln -sf . gnucash 
+	ln -sf . g-wrapped 
+	ln -sf . register
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
+	touch .scm-links
+
 gw-register-core.scm gw-register-core.c gw-register-core.h: .scm-links gw-register-core-spec.scm
 	FLAVOR=gnome guile -c \
 	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
@@ -79,12 +96,5 @@ gw-register-core.scm gw-register-core.c gw-register-core.h: .scm-links gw-regist
 	  (gw:generate-wrapset \"gw-register-core\")"
 
 BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
-CLEANFILES = gw-register-core.scm gw-register-core.c gw-register-core.h \
+CLEANFILES = ${BUILT_SOURCES} gw-register-core.html \
-             gw-register-core.html gnucash g-wrapped register .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped register .scm-links
-
-.scm-links: 
-	rm -f gnucash g-wrapped
-	ln -sf . gnucash 
-	ln -sf . g-wrapped 
-	ln -sf . register
-	touch .scm-links

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

@@ -6,7 +6,7 @@ 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
+   LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
 
 noinst_PROGRAMS = \
   test-link-module

src/register/register-gnome/Makefile.am

@@ -4,11 +4,11 @@ pkglib_LTLIBRARIES = libgncmod-register-gnome.la
 
 libgncmod_register_gnome_la_LDFLAGS = -module 
 libgncmod_register_gnome_la_LIBADD = \
-  ${top_srcdir}/src/register/register-core/libgncmod-register-core.la \
+  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${GLIB_LIBS} \
   ${GNOMEUI_LIBS}
 

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

@@ -6,7 +6,7 @@ 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
+   LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
 
 noinst_PROGRAMS = \
   test-link-module

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

@@ -7,19 +7,29 @@ libgncmod_locale_reports_us_la_SOURCES = \
 
 libgncmod_locale_reports_us_la_LDFLAGS = -module
 libgncmod_locale_reports_us_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} 
 
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = taxtxf.scm
+endif
+
 .scm-links:
 	rm -f gnucash report locale-specific us 
 	ln -sf . gnucash
 	ln -sf . report 
-	ln -sf . locale-specific 
+	ln -sf ${srcdir} locale-specific 
 	ln -sf . us 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 noinst_DATA = .scm-links
@@ -34,4 +44,4 @@ EXTRA_DIST = \
   ${gncscmmod_DATA} \
   ${gncscmothermod_DATA}
 
-CLEANFILES = gnucash report locale-specific us .scm-links
+CLEANFILES = ${SCM_FILE_LINKS} gnucash report locale-specific us .scm-links

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

@@ -9,9 +9,17 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/tax/us \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
+  --gnc-module-dir ${top_builddir}/src/gnome-utils \
+  --gnc-module-dir ${top_builddir}/src/gnome \
+  --gnc-module-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/src/tax/us \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
   --guile-load-dir ${top_srcdir}/src/gnome-utils \
   --guile-load-dir ${top_srcdir}/src/gnome \
   --library-dir    ${top_srcdir}/src/gnome-utils \
@@ -29,4 +37,4 @@ testit:
 
 test_link_module_SOURCES = test-link-module.c
 test_link_module_LDADD= \
-  ${top_srcdir}/src/report/locale-specific/us/libgncmod-locale-reports-us.la
+  ${top_builddir}/src/report/locale-specific/us/libgncmod-locale-reports-us.la

src/report/report-gnome/Makefile.am

@@ -33,10 +33,10 @@ gncinclude_HEADERS = \
 libgncmod_report_gnome_la_LDFLAGS = -module
 
 libgncmod_report_gnome_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
-  ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_srcdir}/src/app-file/libgncmod-app-file.la \
+  ${top_builddir}/src/app-file/libgncmod-app-file.la \
-  ${top_srcdir}/src/report/report-system/libgncmod-report-system.la \
+  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} \
   ${GNOME_PRINT_LIBS} \
@@ -64,23 +64,33 @@ EXTRA_DIST = \
   ${gwmod_DATA} \
   ${gncmod_DATA}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#Only needed when srcdir and builddir are different
+SCM_FILE_LINKS = gw-report-gnome-spec.scm
+endif
+
 .scm-links: 
 	rm -f gnucash g-wrapped
 	ln -sf . gnucash 
 	ln -sf . g-wrapped 
-	ln -sf . report 
+	ln -sf ${srcdir} report 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: .scm-links gw-report-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)) \
+	  (set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
-	  (set! %load-path (cons \"${top_srcdir}/src/app-utils\" %load-path)) \
+	  (set! %load-path (cons \"${top_builddir}/src/app-utils\" %load-path)) \
-	  (set! %load-path (cons \"${top_srcdir}/src/gnome-utils\" %load-path)) \
+	  (set! %load-path (cons \"${top_builddir}/src/gnome-utils\" %load-path)) \
 	  (primitive-load \"./gw-report-gnome-spec.scm\") \
 	  (gw:generate-wrapset \"gw-report-gnome\")"
 
 BUILT_SOURCES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h
-CLEANFILES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h \
+CLEANFILES = ${BUILT_SOURCES} gw-report-gnome.html \
-             gw-report-gnome.html gnucash g-wrapped report .scm-links
+             ${SCM_FILE_LINKS} gnucash g-wrapped report .scm-links

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

@@ -5,16 +5,22 @@ TESTS = \
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/network-utils \
+  --gnc-module-dir ${top_builddir}/src/scm \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/app-file \
+  --gnc-module-dir ${top_builddir}/src/gnome \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/report-gnome \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
   --guile-load-dir ${top_srcdir}/src/gnome-utils \
   --guile-load-dir ${top_srcdir}/src/gnome \
   --library-dir    ${top_srcdir}/src/gnome-utils \

src/report/report-system/Makefile.am

@@ -12,17 +12,27 @@ gncinclude_HEADERS = \
 
 libgncmod_report_system_la_LDFLAGS = -module
 libgncmod_report_system_la_LIBADD = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = report-system.scm
+endif
+
 .scm-links:
 	rm -f gnucash report
 	ln -sf . gnucash
 	ln -sf . report 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
@@ -48,4 +58,4 @@ gncscm_DATA = \
 
 EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA}
 
-CLEANFILES = gnucash report .scm-links
+CLEANFILES = ${SCM_FILE_LINKS} gnucash report .scm-links

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

@@ -5,14 +5,21 @@ TESTS = \
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_builddir}/src/gnome \
+  --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
   --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${top_srcdir}/src/scm \
   --guile-load-dir ${top_srcdir}/src/gnome-utils \
   --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
   --library-dir    ${top_srcdir}/src/gnome-utils \
   --library-dir    ${top_srcdir}/src/gnome
 

src/report/standard-reports/Makefile.am

@@ -12,7 +12,7 @@ AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 .scm-links:
 	rm -f gnucash report
 	ln -sf . gnucash
-	ln -sf . report 
+	ln -sf ${srcdir} report 
 	touch .scm-links
 
 noinst_DATA = .scm-links

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

@@ -3,15 +3,23 @@ TESTS=test-load-module
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_builddir}/src/gnome \
+  --gnc-module-dir ${top_builddir}/src/gnome-utils \
+  --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/report/standard-reports \
-  --guile-load-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/lib \
+  --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
+  --guile-load-dir ${top_srcdir}/lib \
-  --guile-load-dir ${top_builddir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${top_srcdir}/src/gnome-utils \
+  --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
   --library-dir ${top_builddir}/src/gnome-utils \
   --library-dir ${top_builddir}/src/gnome
 

src/report/stylesheets/Makefile.am

@@ -12,7 +12,7 @@ AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 .scm-links:
 	rm -f gnucash report
 	ln -sf . gnucash
-	ln -sf . report 
+	ln -sf ${srcdir} report 
 	touch .scm-links
 
 noinst_DATA = .scm-links

src/report/stylesheets/test/Makefile.am

@@ -2,15 +2,21 @@ TESTS=test-load-module
 
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/scm \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/utility-reports \
   --gnc-module-dir ${top_builddir}/src/report/stylesheets \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/calculation \
-  --guile-load-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/lib \
+  --gnc-module-dir ${top_srcdir}/src/engine \
+  --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
+  --guile-load-dir ${top_srcdir}/src/report/stylesheets \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/gnome \
   --library-dir ${top_builddir}/src/gnome-utils \

src/report/utility-reports/Makefile.am

@@ -12,7 +12,7 @@ AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 .scm-links:
 	rm -f gnucash report
 	ln -sf . gnucash
-	ln -sf . report 
+	ln -sf ${srcdir} report 
 	touch .scm-links
 
 noinst_DATA = .scm-links

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

@@ -3,15 +3,23 @@ TESTS = test-load-module
 GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_builddir}/src/gnome \
+  --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/utility-reports \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/calculation \
-  --guile-load-dir ${top_builddir}/src/scm \
+  --gnc-module-dir ${top_srcdir}/src/gnc-module \
-  --guile-load-dir ${top_builddir}/lib \
+  --gnc-module-dir ${top_srcdir}/src/engine \
+  --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/lib \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \
-  --guile-load-dir ${top_builddir}/src/gnome-utils \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
-  --guile-load-dir ${top_builddir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/gnome-utils \
+  --guile-load-dir ${top_srcdir}/src/gnome \
+  --guile-load-dir ${top_srcdir}/src/report/report-system \
+  --guile-load-dir ${top_srcdir}/src/report/utility-reports \
   --library-dir ${top_builddir}/src/gnome-utils \
   --library-dir ${top_builddir}/src/gnome
 

src/scm/Makefile.am

@@ -27,7 +27,7 @@ config_DATA = config
 
 .scm-links: 
 	rm -f gnucash
-	ln -sf . gnucash
+	ln -sf ${srcdir} gnucash
 	touch .scm-links
 
 CLEANFILES = .scm-links gnucash 
@@ -47,7 +47,7 @@ EXTRA_DIST = \
 ## the sed substitutions.  *sigh*
 build-config.scm: build-config.scm.in Makefile
 	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
+	sed < $< > $@.tmp \
             -e 's:@-VERSION-@:${VERSION}:' \
             -e 's:@-GNC_CONFIGDIR-@:${GNC_CONFIGDIR}:' \
             -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' \

src/tax/us/Makefile.am

@@ -12,10 +12,20 @@ libgncmod_tax_us_la_LIBADD = \
 
 AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
 
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = us.scm
+endif
+
 .scm-links:
 	rm -f gnucash tax
 	ln -sf . gnucash
 	ln -sf . tax 
+if GNUCASH_SEPARATE_BUILDDIR
+	for X in ${SCM_FILE_LINKS} ; do \
+	  ln -sf ${srcdir}/$$X . ; \
+	done
+endif
 	touch .scm-links
 
 noinst_DATA = .scm-links
@@ -30,4 +40,4 @@ EXTRA_DIST = \
   ${gncscmmod_DATA} \
   ${gncscm_DATA}
 
-CLEANFILES = gnucash tax .scm-links
+CLEANFILES = ${SCM_FILE_LINKS} gnucash tax .scm-links

src/tax/us/test/Makefile.am

@@ -10,6 +10,7 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/tax/us \
+  --gnc-module-dir ${top_srcdir}/src/tax/us \
   --guile-load-dir ${top_builddir}/src/scm \
   --guile-load-dir ${top_builddir}/lib \
   --guile-load-dir ${G_WRAP_MODULE_DIR} \

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 = \
-  ${top_srcdir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-stuff.h