From 5acdbb6f52bc449d19fdc7b0b5ec147a9ff99e40 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 26 Oct 2014 23:05:55 +0100 Subject: [PATCH] Rewrite old-fashioned makefile construct --- src/app-utils/test/Makefile.am | 2 +- src/backend/xml/test/Makefile.am | 2 +- src/engine/test/Makefile.am | 2 +- src/gnome-utils/test/Makefile.am | 2 +- src/import-export/test/Makefile.am | 2 +- src/optional/python-bindings/tests/Makefile.am | 2 +- src/report/report-gnome/test/Makefile.am | 2 +- src/report/report-system/test/Makefile.am | 2 +- src/report/standard-reports/test/Makefile.am | 2 +- src/report/stylesheets/test/Makefile.am | 2 +- src/report/utility-reports/test/Makefile.am | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am index 3a00263bb7..8510dffb34 100644 --- a/src/app-utils/test/Makefile.am +++ b/src/app-utils/test/Makefile.am @@ -31,7 +31,7 @@ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ SRCDIR=${srcdir} \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) LDADD = \ diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am index f32419f23a..0575f90936 100644 --- a/src/backend/xml/test/Makefile.am +++ b/src/backend/xml/test/Makefile.am @@ -216,7 +216,7 @@ TESTS_ENVIRONMENT = \ GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \ GNC_TEST_FILES=test-files/xml2 \ SRCDIR=${srcdir} \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) check_LTLIBRARIES = libgnc-test-file-stuff.la diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am index 38fc13a932..2a1ce64b5a 100644 --- a/src/engine/test/Makefile.am +++ b/src/engine/test/Makefile.am @@ -67,7 +67,7 @@ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ SRCDIR=${srcdir} \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) check_PROGRAMS = \ diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am index 1ec3511970..f80c4f0e64 100644 --- a/src/gnome-utils/test/Makefile.am +++ b/src/gnome-utils/test/Makefile.am @@ -30,7 +30,7 @@ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ SRCDIR=${srcdir} \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) check_PROGRAMS = \ diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am index 7eee4db69a..5363e8adf2 100644 --- a/src/import-export/test/Makefile.am +++ b/src/import-export/test/Makefile.am @@ -47,7 +47,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) check_PROGRAMS = \ diff --git a/src/optional/python-bindings/tests/Makefile.am b/src/optional/python-bindings/tests/Makefile.am index 04a96b4923..d828941c06 100644 --- a/src/optional/python-bindings/tests/Makefile.am +++ b/src/optional/python-bindings/tests/Makefile.am @@ -15,7 +15,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/test-core TESTS_ENVIRONMENT = \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ PYTHON=${PYTHON} \ PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings \ PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings/.libs \ diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am index 4e998cc0ec..98b12fc6f6 100644 --- a/src/report/report-gnome/test/Makefile.am +++ b/src/report/report-gnome/test/Makefile.am @@ -52,7 +52,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/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 859454a69a..3e5dd8c863 100644 --- a/src/report/report-system/test/Makefile.am +++ b/src/report/report-system/test/Makefile.am @@ -57,7 +57,7 @@ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/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 9fe4f5baf1..61c48affcf 100644 --- a/src/report/standard-reports/test/Makefile.am +++ b/src/report/standard-reports/test/Makefile.am @@ -47,7 +47,7 @@ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/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 6b8fd45757..092b7be390 100644 --- a/src/report/stylesheets/test/Makefile.am +++ b/src/report/stylesheets/test/Makefile.am @@ -33,7 +33,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) EXTRA_DIST = test-load-module diff --git a/src/report/utility-reports/test/Makefile.am b/src/report/utility-reports/test/Makefile.am index de6c7f42f0..939305cea9 100644 --- a/src/report/utility-reports/test/Makefile.am +++ b/src/report/utility-reports/test/Makefile.am @@ -28,7 +28,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ TESTS_ENVIRONMENT = \ GUILE_WARN_DEPRECATED=no \ GUILE="${GUILE}" \ - GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \ + GNC_BUILDDIR="${abs_top_builddir}" \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS}) EXTRA_DIST = test-load-module