r23034 - gnucash/trunk/src/report - Fix distcheck and automake 1.13 build failure

[Geert Janssens]

Author: gjanssens
Date: 2013-06-03 17:59:59 -0400 (Mon, 03 Jun 2013)
New Revision: 23034
Trac: http://svn.gnucash.org/trac/changeset/23034

Modified:
   gnucash/trunk/src/report/report-system/Makefile.am
   gnucash/trunk/src/report/report-system/test/Makefile.am
   gnucash/trunk/src/report/standard-reports/test/Makefile.am
Log:
Fix distcheck and automake 1.13 build failure

Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am	2013-06-03 21:59:46 UTC (rev 23033)
+++ gnucash/trunk/src/report/report-system/Makefile.am	2013-06-03 21:59:59 UTC (rev 23034)
@@ -101,7 +101,7 @@
 
 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

Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am	2013-06-03 21:59:46 UTC (rev 23033)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am	2013-06-03 21:59:59 UTC (rev 23034)
@@ -19,10 +19,12 @@
   $(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 \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
@@ -48,7 +50,7 @@
   --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 @@
 
 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 @@
 
 noinst_DATA = .scm-links
 CLEANFILES = .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS}
+DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)

Modified: gnucash/trunk/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/Makefile.am	2013-06-03 21:59:46 UTC (rev 23033)
+++ gnucash/trunk/src/report/standard-reports/test/Makefile.am	2013-06-03 21:59:59 UTC (rev 23034)
@@ -37,20 +37,25 @@
   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 @@
 	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 @@
 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)
 
-