From 1af034128769f38e0e3b797a1f45434f260ace7e Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Mon, 3 Jun 2002 14:02:35 +0000 Subject: [PATCH] Support g-wrap in non-standard location git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6943 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-file/test/Makefile.am | 3 ++- src/app-utils/test/Makefile.am | 3 ++- src/backend/file/test/Makefile.am | 3 ++- src/gnome-utils/test/Makefile.am | 3 ++- src/network-utils/test/Makefile.am | 3 ++- src/report/locale-specific/us/test/Makefile.am | 3 ++- src/report/report-gnome/test/Makefile.am | 3 ++- src/report/report-system/test/Makefile.am | 3 ++- src/report/standard-reports/test/Makefile.am | 5 +++-- src/report/stylesheets/test/Makefile.am | 5 +++-- src/tax/us/test/Makefile.am | 3 ++- 11 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/app-file/test/Makefile.am b/src/app-file/test/Makefile.am index 77442133e2..91a7c3cacb 100644 --- a/src/app-file/test/Makefile.am +++ b/src/app-file/test/Makefile.am @@ -17,7 +17,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/gnome-utils \ --guile-load-dir ${top_srcdir}/src/app-utils \ --library-dir ${top_srcdir}/src/gnome \ - --library-dir ${top_srcdir}/src/gnome-utils + --library-dir ${top_srcdir}/src/gnome-utils \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am index 9fb349789a..05e5c90326 100644 --- a/src/app-utils/test/Makefile.am +++ b/src/app-utils/test/Makefile.am @@ -19,7 +19,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_builddir}/src/gnome-utils \ --guile-load-dir ${top_builddir}/src/gnome \ --library-dir ${top_builddir}/src/gnome-utils \ - --library-dir ${top_srcdir}/src/gnome + --library-dir ${top_srcdir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/backend/file/test/Makefile.am b/src/backend/file/test/Makefile.am index c54037f339..f2b68a74e7 100644 --- a/src/backend/file/test/Makefile.am +++ b/src/backend/file/test/Makefile.am @@ -21,7 +21,8 @@ GNC_TEST_DEPS := \ --gnc-module-dir ${top_builddir}/src/backend/file \ --gnc-module-dir ${top_srcdir}/src/gnc-module \ --gnc-module-dir ${top_srcdir}/src/engine \ - --guile-load-dir ${G_WRAP_MODULE_DIR} + --guile-load-dir ${G_WRAP_MODULE_DIR} \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \ diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am index 2faaa53e4d..ab16e9550a 100644 --- a/src/gnome-utils/test/Makefile.am +++ b/src/gnome-utils/test/Makefile.am @@ -17,7 +17,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/engine \ --guile-load-dir ${top_srcdir}/src/app-utils \ --guile-load-dir ${top_srcdir}/src/gnome-utils \ - --library-dir ${top_srcdir}/src/gnome + --library-dir ${top_srcdir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/network-utils/test/Makefile.am b/src/network-utils/test/Makefile.am index 077a14cca6..8ef7122916 100644 --- a/src/network-utils/test/Makefile.am +++ b/src/network-utils/test/Makefile.am @@ -5,7 +5,8 @@ TESTS = \ GNC_TEST_DEPS := \ --gnc-module-dir ${top_builddir}/src/gnc-module \ --gnc-module-dir ${top_builddir}/src/network-utils \ - --guile-load-dir ${G_WRAP_MODULE_DIR} + --guile-load-dir ${G_WRAP_MODULE_DIR} \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/report/locale-specific/us/test/Makefile.am b/src/report/locale-specific/us/test/Makefile.am index a4f57f48bc..5a4ab65124 100644 --- a/src/report/locale-specific/us/test/Makefile.am +++ b/src/report/locale-specific/us/test/Makefile.am @@ -23,7 +23,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/gnome-utils \ --guile-load-dir ${top_srcdir}/src/gnome \ --library-dir ${top_srcdir}/src/gnome-utils \ - --library-dir ${top_srcdir}/src/gnome + --library-dir ${top_srcdir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am index 8509b69613..5c5cc1859f 100644 --- a/src/report/report-gnome/test/Makefile.am +++ b/src/report/report-gnome/test/Makefile.am @@ -24,7 +24,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/gnome-utils \ --guile-load-dir ${top_srcdir}/src/gnome \ --library-dir ${top_srcdir}/src/gnome-utils \ - --library-dir ${top_srcdir}/src/gnome + --library-dir ${top_srcdir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am index 75fc12c39d..26085029e3 100644 --- a/src/report/report-system/test/Makefile.am +++ b/src/report/report-system/test/Makefile.am @@ -21,7 +21,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/app-utils \ --guile-load-dir ${top_srcdir}/src/report/report-system \ --library-dir ${top_srcdir}/src/gnome-utils \ - --library-dir ${top_srcdir}/src/gnome + --library-dir ${top_srcdir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am index 82d982dab8..5bc56ca2fc 100644 --- a/src/report/standard-reports/test/Makefile.am +++ b/src/report/standard-reports/test/Makefile.am @@ -20,8 +20,9 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/gnome-utils \ --guile-load-dir ${top_srcdir}/src/gnome \ --guile-load-dir ${top_srcdir}/src/report/report-system \ - --library-dir ${top_builddir}/src/gnome-utils \ - --library-dir ${top_builddir}/src/gnome + --library-dir ${top_builddir}/src/gnome-utils \ + --library-dir ${top_builddir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/report/stylesheets/test/Makefile.am b/src/report/stylesheets/test/Makefile.am index b73aafb8ec..51ef00e779 100644 --- a/src/report/stylesheets/test/Makefile.am +++ b/src/report/stylesheets/test/Makefile.am @@ -19,8 +19,9 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_srcdir}/src/report/stylesheets \ --guile-load-dir ${top_builddir}/src/gnome-utils \ --guile-load-dir ${top_builddir}/src/gnome \ - --library-dir ${top_builddir}/src/gnome-utils \ - --library-dir ${top_builddir}/src/gnome + --library-dir ${top_builddir}/src/gnome-utils \ + --library-dir ${top_builddir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) diff --git a/src/tax/us/test/Makefile.am b/src/tax/us/test/Makefile.am index decfcb7eb1..6451b718a7 100644 --- a/src/tax/us/test/Makefile.am +++ b/src/tax/us/test/Makefile.am @@ -17,7 +17,8 @@ GNC_TEST_DEPS := \ --guile-load-dir ${top_builddir}/src/gnome-utils \ --guile-load-dir ${top_builddir}/src/gnome \ --library-dir ${top_builddir}/src/gnome-utils \ - --library-dir ${top_builddir}/src/gnome + --library-dir ${top_builddir}/src/gnome \ + --library-dir ${G_WRAP_LIB_DIR} TESTS_ENVIRONMENT := \ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})