r19935 - gnucash/trunk/src - Make "make check" work when run from "make distcheck".
Mike Alexander
mta at code.gnucash.org
Mon Dec 13 12:08:41 EST 2010
Author: mta
Date: 2010-12-13 12:08:41 -0500 (Mon, 13 Dec 2010)
New Revision: 19935
Trac: http://svn.gnucash.org/trac/changeset/19935
Modified:
gnucash/trunk/src/app-utils/test/Makefile.am
gnucash/trunk/src/backend/dbi/test/Makefile.am
gnucash/trunk/src/backend/sql/test/Makefile.am
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/business/business-core/test/Makefile.am
gnucash/trunk/src/core-utils/test/Makefile.am
gnucash/trunk/src/engine/test/Makefile.am
gnucash/trunk/src/gnc-module/test/Makefile.am
gnucash/trunk/src/gnome-utils/test/Makefile.am
gnucash/trunk/src/import-export/test/Makefile.am
gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
gnucash/trunk/src/report/report-gnome/test/Makefile.am
gnucash/trunk/src/report/report-system/test/Makefile.am
gnucash/trunk/src/report/standard-reports/test/Makefile.am
gnucash/trunk/src/report/stylesheets/test/Makefile.am
gnucash/trunk/src/report/utility-reports/test/Makefile.am
Log:
Make "make check" work when run from "make distcheck".
Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/app-utils/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -22,7 +22,7 @@
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/src/app-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -25,7 +25,7 @@
GNC_TEST_DEPS = \
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine
@@ -77,3 +77,8 @@
${GCONF_CFLAGS}
INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
+
+# If you let make run parallel builds it complains that there is no rule to make
+# libgncmod-test-dbi.la. This is wrong, but I can't figure out how to fix it
+# so I'll turn off parallel builds
+.NOTPARALLEL:
Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -9,7 +9,7 @@
GNC_TEST_DEPS = \
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -183,7 +183,7 @@
GNC_TEST_DEPS = \
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -33,7 +33,7 @@
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/business/business-core \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/core-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/core-utils/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -22,7 +22,7 @@
test-resolve-file-path
GNC_TEST_DEPS = \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils
TESTS_ENVIRONMENT = \
Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/engine/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -50,7 +50,7 @@
--gnc-module-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine
Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -32,6 +32,7 @@
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
--guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnc-module/test/mod-foo \
Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -12,7 +12,7 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -25,7 +25,7 @@
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/import-export \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/locale-specific/us/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -7,7 +7,7 @@
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/tax/us \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/report-gnome/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -7,7 +7,7 @@
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -6,7 +6,7 @@
--gnc-module-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/standard-reports/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -5,7 +5,7 @@
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/stylesheets/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -5,7 +5,7 @@
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
Modified: gnucash/trunk/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/test/Makefile.am 2010-12-13 16:05:29 UTC (rev 19934)
+++ gnucash/trunk/src/report/utility-reports/test/Makefile.am 2010-12-13 17:08:41 UTC (rev 19935)
@@ -5,7 +5,7 @@
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
More information about the gnucash-changes
mailing list