From 4f4130528e87e2d5367fcc2664aee48eb66e25ee Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Mon, 3 Jun 2013 21:59:59 +0000
Subject: [PATCH] Fix distcheck and automake 1.13 build failure

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23034 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/report/report-system/Makefile.am         |  2 +-
 src/report/report-system/test/Makefile.am    | 19 ++++++++-----
 src/report/standard-reports/test/Makefile.am | 30 +++++++++++---------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 65b7676f87..44d1512f51 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -101,7 +101,7 @@ endif
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA}
+EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA} ${gncmodscm_DATA}
 
 clean-local:
 	rm -rf gnucash
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index 943044aa09..cc5cf76361 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/src/report/report-system/test/Makefile.am
@@ -19,9 +19,11 @@ TESTS = \
   $(SCM_TESTS)
 
 SCM_TESTS = \
-	test-collectors.scm \
-	test-list-extras.scm \
-	test-test-extras.scm
+	test-collectors.sh \
+	test-list-extras.sh \
+	test-test-extras.sh
+
+SCM_TEST_SRCS = $(SCM_TESTS:%.sh=%.scm)
 
 GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/app-utils \
@@ -48,7 +50,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/backend/sql  \
   --library-dir    ${top_builddir}/src/gnc-module
 
-$(SCM_TESTS): %.scm: Makefile
+$(SCM_TESTS): %.sh: Makefile .scm-links
 	echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
 	chmod a+x $@
 
@@ -60,14 +62,17 @@ TESTS_ENVIRONMENT = \
 
 check_PROGRAMS = test-link-module
 
-EXTRA_DIST = test-load-module
+EXTRA_DIST = \
+	test-load-module \
+	test-extras.scm \
+	$(SCM_TEST_SRCS)
 
 testit:
 	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
 
 
 if GNUCASH_SEPARATE_BUILDDIR
-SCM_FILE_LINKS = test-extras.scm
+SCM_FILE_LINKS = test-extras.scm $(SCM_TEST_SRCS)
 endif
 
 .scm-links:
@@ -89,4 +94,4 @@ clean-local:
 
 noinst_DATA = .scm-links
 CLEANFILES = .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS}
+DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
index 0406519cb8..7d0bc9b62a 100644
--- a/src/report/standard-reports/test/Makefile.am
+++ b/src/report/standard-reports/test/Makefile.am
@@ -37,20 +37,25 @@ TESTS_ENVIRONMENT = \
   GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
-EXTRA_DIST = test-load-module
+SCM_TEST_HELPERS = \
+	test-generic-category-report.scm \
+	test-generic-net-barchart.scm \
+	test-generic-net-linechart.scm
 
 SCM_TESTS = \
-	test-standard-category-report.scm \
-	test-standard-net-barchart.scm \
-	test-standard-net-linechart.scm
+	test-standard-category-report.sh \
+	test-standard-net-barchart.sh \
+	test-standard-net-linechart.sh
+
+SCM_TEST_SRCS = $(SCM_TESTS:%.sh=%.scm)
+
+EXTRA_DIST = test-load-module $(SCM_TEST_HELPERS) $(SCM_TEST_SRCS)
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
 SCM_FILE_LINKS = \
-	test-generic-category-report.scm \
-	test-generic-net-barchart.scm \
-	test-generic-net-linechart.scm \
-	$(SCM_TESTS)
+	$(SCM_TEST_HELPERS) \
+	$(SCM_TEST_SRCS)
 endif
 
 .scm-links:
@@ -67,7 +72,7 @@ if ! OS_WIN32
 	touch .scm-links
 endif
 
-$(patsubst %.scm,%,$(SCM_TESTS)): %: Makefile .scm-links
+$(SCM_TESTS): %.sh: Makefile .scm-links
 	echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
 	chmod a+x $@
 
@@ -77,13 +82,12 @@ interp:
 debug:
 	$(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST))
 
-TESTS = $(patsubst %.scm,%,$(SCM_TESTS)) $(MODULE_TESTS)
+TESTS = $(SCM_TESTS) $(MODULE_TESTS)
 
 clean-local:
 	$(RM) -rf gnucash
 
 noinst_DATA = .scm-links
-CLEANFILES = .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS}
-
+CLEANFILES = .scm-links *.log
+DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)