IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix distcheck and automake 1.13 build failure

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23034 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-06-03 21:59:59 +00:00
parent dfbd34c22f
commit 4f4130528e
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/report/report-system/Makefile.am
View File

@ -101,7 +101,7 @@ endif
noinst_DATA = .scm-links 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: clean-local:
rm -rf gnucash rm -rf gnucash

19
src/report/report-system/test/Makefile.am
View File

@ -19,9 +19,11 @@ TESTS = \
$(SCM_TESTS) $(SCM_TESTS)
SCM_TESTS = \ SCM_TESTS = \
test-collectors.scm \ test-collectors.sh \
test-list-extras.scm \ test-list-extras.sh \
test-test-extras.scm test-test-extras.sh
SCM_TEST_SRCS = $(SCM_TESTS:%.sh=%.scm)
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/app-utils \ --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/backend/sql \
--library-dir ${top_builddir}/src/gnc-module --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))"' > $@ echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
chmod a+x $@ chmod a+x $@
@ -60,14 +62,17 @@ TESTS_ENVIRONMENT = \
check_PROGRAMS = test-link-module check_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module EXTRA_DIST = \
test-load-module \
test-extras.scm \
$(SCM_TEST_SRCS)
testit: testit:
$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module $(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
SCM_FILE_LINKS = test-extras.scm SCM_FILE_LINKS = test-extras.scm $(SCM_TEST_SRCS)
endif endif
.scm-links: .scm-links:
@ -89,4 +94,4 @@ clean-local:
noinst_DATA = .scm-links noinst_DATA = .scm-links
CLEANFILES = .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)

30
src/report/standard-reports/test/Makefile.am
View File

@ -37,20 +37,25 @@ TESTS_ENVIRONMENT = \
GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) $(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 = \ SCM_TESTS = \
test-standard-category-report.scm \ test-standard-category-report.sh \
test-standard-net-barchart.scm \ test-standard-net-barchart.sh \
test-standard-net-linechart.scm 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 if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases #For executing test cases
SCM_FILE_LINKS = \ SCM_FILE_LINKS = \
test-generic-category-report.scm \ $(SCM_TEST_HELPERS) \
test-generic-net-barchart.scm \ $(SCM_TEST_SRCS)
test-generic-net-linechart.scm \
$(SCM_TESTS)
endif endif
.scm-links: .scm-links:
@ -67,7 +72,7 @@ if ! OS_WIN32
touch .scm-links touch .scm-links
endif endif
$(patsubst %.scm,%,$(SCM_TESTS)): %: Makefile .scm-links $(SCM_TESTS): %.sh: Makefile .scm-links
echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@ echo 'guile --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
chmod a+x $@ chmod a+x $@
@ -77,13 +82,12 @@ interp:
debug: debug:
$(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST)) $(TESTS_ENVIRONMENT) gdb --args $(shell cat $(TEST))
TESTS = $(patsubst %.scm,%,$(SCM_TESTS)) $(MODULE_TESTS) TESTS = $(SCM_TESTS) $(MODULE_TESTS)
clean-local: clean-local:
$(RM) -rf gnucash $(RM) -rf gnucash
noinst_DATA = .scm-links noinst_DATA = .scm-links
CLEANFILES = .scm-links CLEANFILES = .scm-links *.log
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)