r21645 - gnucash/trunk/src - Make distcheck fixes.

[John Ralls]

Author: jralls
Date: 2011-11-29 16:29:37 -0500 (Tue, 29 Nov 2011)
New Revision: 21645
Trac: http://svn.gnucash.org/trac/changeset/21645

Modified:
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/engine/test/Makefile.am
   gnucash/trunk/src/libqof/qof/test/Makefile.am
Log:
Make distcheck fixes.


Fix some errors in r21570 which cause "make distcheck" to fail, and a couple of others besides.

While this gets distcheck to work on the Mac, there are still some problems with the standard-reports test on Linux related to trying to load reports from the installation directory (make install is run *after* make check during make distcheck). This test passes on the Mac, fails on Linux.

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2011-11-29 19:08:19 UTC (rev 21644)
+++ gnucash/trunk/src/core-utils/Makefile.am	2011-11-29 21:29:37 UTC (rev 21645)
@@ -42,12 +42,10 @@
 swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
-if WITH_PYTHON
 swig-core-utils-python.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
 	-I${top_srcdir}/src -o $@ $<
 endif
-endif
 
 AM_CPPFLAGS = \
   ${GUILE_INCS} \

Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am	2011-11-29 19:08:19 UTC (rev 21644)
+++ gnucash/trunk/src/engine/test/Makefile.am	2011-11-29 21:29:37 UTC (rev 21645)
@@ -104,7 +104,7 @@
 
 TEST_PROGS += test-engine
 
-noinst_PROGRAMS = ${TEST_PROGS}
+noinst_PROGRAMS = ${TEST_PROGS} ${CHECK_PROGS}
 
 test_engine_SOURCES = \
 	test-engine.c \
@@ -113,7 +113,7 @@
 test_engine_HEADERS = \
 	${top_srcdir}/${MODULEPATH}/gnc-engine.h
 
-test_enginedir = ${top_builddir}/${MODULEPATH}/test
+test_enginedir = ${GNC_LIBEXECDIR}/${MODULEPATH}/test
 
 test_engine_LDADD = \
 	${top_builddir}/${MODULEPATH}/libgncmod-engine.la \

Modified: gnucash/trunk/src/libqof/qof/test/Makefile.am
===================================================================
--- gnucash/trunk/src/libqof/qof/test/Makefile.am	2011-11-29 19:08:19 UTC (rev 21644)
+++ gnucash/trunk/src/libqof/qof/test/Makefile.am	2011-11-29 21:29:37 UTC (rev 21645)
@@ -27,7 +27,7 @@
 TEST_PROGS += test-qof
 
 noinst_PROGRAMS = ${TEST_PROGS}
-test_qofdir = ${top_builddir}/${MODULEPATH}/test
+test_qofdir = ${GNC_LIBEXECDIR}/${MODULEPATH}/test
 
 #The tests might require more libraries, but try to keep them
 #as independent as possible.