From dca16c893374949fdaaac971e39f0cf6ac08e547 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 12 Dec 2014 12:55:05 -0800 Subject: [PATCH] Still more Guile precompilation fixes. This time for gcc-4.2, used for OSX 10.5-compatible releases. --- src/core-utils/Makefile.am | 4 +++- src/engine/Makefile.am | 5 ++++- src/gnc-module/Makefile.am | 4 +++- src/gnome-utils/Makefile.am | 1 + src/scm/Makefile.am | 4 +++- src/test-core/Makefile.am | 4 +++- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index d29163ed2e..144b8b9ea1 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -114,7 +114,9 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/src/core-utils + --library-dir ${top_builddir}/src/core-utils \ + --library-dir ${top_builddir}/src/libqof/qof + %.go : %.scm .scm-links $(lib_LTLIBRARIES) GNC_UNINSTALLED=yes \ diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 720e2093cd..150e09a9c7 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -194,7 +194,10 @@ if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/gnc-module + --library-dir ${top_builddir}/src/gnc-module \ + --library-dir ${top_builddir}/src/core-utils \ + --library-dir ${top_builddir}/src/libqof/qof + %.go : %.scm .scm-links $(pkglib_LTLIBRARIES) GNC_UNINSTALLED=yes \ diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am index 3c05ef376f..71f0048c74 100644 --- a/src/gnc-module/Makefile.am +++ b/src/gnc-module/Makefile.am @@ -67,7 +67,9 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/src/gnc-module + --library-dir ${top_builddir}/src/gnc-module \ + --library-dir ${top_builddir}/src/core-utils \ + --library-dir ${top_builddir}/src/libqof/qof %.go : %.scm .scm-links $(lib_LTLIBRARIES) GNC_UNINSTALLED=yes \ diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index c981699ff2..b46ed7a8c0 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -284,6 +284,7 @@ GUILE_COMPILE_ENV = \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/app-utils \ + --library-dir ${top_builddir}/src/backend/xml \ --library-dir ${top_builddir}/src/gnome-utils %.go : %.scm .scm-links $(pkglib_LTLIBRARIES) diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am index a0bf4fa3e2..ea07c85a6b 100644 --- a/src/scm/Makefile.am +++ b/src/scm/Makefile.am @@ -47,7 +47,9 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/core-utils \ - --library-dir ${top_builddir}/src/gnc-module + --library-dir ${top_builddir}/src/gnc-module \ + --library-dir ${top_builddir}/src/libqof/qof + %.go : %.scm .scm-links $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am index d55cd5ef17..cfa7f6dfa2 100644 --- a/src/test-core/Makefile.am +++ b/src/test-core/Makefile.am @@ -99,7 +99,9 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/src/test-core + --library-dir ${top_builddir}/src/test-core \ + --library-dir ${top_builddir}/src/libqof/qof + %.go : %.scm .scm-links $(noinst_LTLIBRARIES) GNC_UNINSTALLED=yes \