gnucash maint: Fix Guile-2.0 precompilation.

John Ralls jralls at code.gnucash.org
Tue Dec 2 00:51:02 EST 2014


Updated	 via  https://github.com/Gnucash/gnucash/commit/a26801ab (commit)
	from  https://github.com/Gnucash/gnucash/commit/5aa8f8db (commit)



commit a26801ab0e12ba44e9dc505ce87dc11ebd26a4ac
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Dec 1 15:36:48 2014 -0800

    Fix Guile-2.0 precompilation.

diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 7dcbaf4..8ad01e1 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -210,9 +210,10 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/scm \
-  --library-dir    ${top_builddir}/src/app-utils \
-  --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/app-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -230,7 +231,12 @@ endif
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = ${SCM_FILE_LINKS}  .scm-links
+CLEANFILES = \
+	${SCM_FILE_LINKS} \
+	 .scm-links \
+	${gncscmcache_DATA} \
+	${gncscmmodcache_DATA}
+
 MAINTAINERCLEANFILES = swig-app-utils-guile.c swig-app-utils-python.c
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.app-utils\"
diff --git a/src/app-utils/business-prefs.scm b/src/app-utils/business-prefs.scm
index 248ee3f..a49ab43 100644
--- a/src/app-utils/business-prefs.scm
+++ b/src/app-utils/business-prefs.scm
@@ -19,7 +19,7 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu at gnu.org
 
-(use-modules (gnucash gettext))
+(use-modules (gnucash app-utils))
 
 (define gnc:*option-section-counters* (N_ "Counters"))
 
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 0c94c37..4eeb61a 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -126,9 +126,17 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/report/standard-reports \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/app-utils \
   --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/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/report/report-system
+
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -144,6 +152,10 @@ noinst_DATA = .scm-links
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = $(BUILT_SOURCES) .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	.scm-links \
+	${SCM_FILE_LINKS} \
+	${gncscmmodcache_DATA}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.gnome\"
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index ea670c1..d29163e 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -132,7 +132,8 @@ EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = $(BUILT_SOURCES) .scm-links
+CLEANFILES = $(BUILT_SOURCES) .scm-links ${gncscmmodcache_DATA}
+
 MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" -DGNC_SCM_INSTALL_DIR="\"${GNC_SCM_INSTALL_DIR}\""
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index c3756a2..720e209 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -240,8 +240,13 @@ iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 
 BUILT_SOURCES = iso-4217-currencies.c
 
-CLEANFILES = $(BUILT_SOURCES) .scm-links \
-	${SCM_FILE_LINKS}
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	.scm-links \
+	${SCM_FILE_LINKS} \
+	${gncscmmodcache_DATA} \
+	${gncscmcache_DATA}
+
 MAINTAINERCLEANFILES = swig-engine.c
 
 clean-local:
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index cb8ed45..c981699 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -279,8 +279,11 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/engine \
+  --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/app-utils \
   --library-dir    ${top_builddir}/src/gnome-utils
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
@@ -300,7 +303,13 @@ noinst_DATA = .scm-links
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = $(BUILT_SOURCES) .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	.scm-links \
+	${SCM_FILE_LINKS} \
+	${gncscmcache_DATA} \
+	${gncscmmodcache_DATA}
+
 MAINTAINERCLEANFILES = swig-gnome-utils.c
 
 # FIXME: Symlinking directories only works on non-win32.
diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am
index 165777d..2ea474b 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/src/import-export/qif-imp/Makefile.am
@@ -104,9 +104,23 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \
+  --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/gnome \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/report/report-system \
+  --library-dir    ${top_builddir}/src/report/report-gnome \
+  --library-dir    ${top_builddir}/src/register/register-gnome \
+  --library-dir    ${top_builddir}/src/register/register-core \
+  --library-dir    ${top_builddir}/src/register/ledger-core \
+  --library-dir    ${top_builddir}/src/gnome-search
+
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -124,7 +138,7 @@ endif
 clean-local:
 	$(RM) -rf gnucash qif-import
 
-CLEANFILES += .scm-links
+CLEANFILES += .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif.import\"
diff --git a/src/libqof/qof/gnc-numeric.c b/src/libqof/qof/gnc-numeric.c
index 5207ce2..89c899c 100644
--- a/src/libqof/qof/gnc-numeric.c
+++ b/src/libqof/qof/gnc-numeric.c
@@ -40,10 +40,10 @@
 
 /* static short module = MOD_ENGINE; */
 static const gint64 pten[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
-			       10000000, 100000000, 1000000000, 10000000000,
-			       100000000000, 1000000000000, 10000000000000,
-			       100000000000000, 10000000000000000,
-			       100000000000000000, 1000000000000000000};
+			       10000000LL, 100000000LL, 1000000000LL, 10000000000LL,
+			       100000000000LL, 1000000000000LL, 10000000000000LL,
+			       100000000000000LL, 10000000000000000LL,
+			       100000000000000000LL, 1000000000000000000LL};
 #define POWTEN_OVERFLOW -5
 
 static inline gint64
diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am
index 4975148..8ea9dfe 100644
--- a/src/report/business-reports/Makefile.am
+++ b/src/report/business-reports/Makefile.am
@@ -59,9 +59,17 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/report/standard-reports \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
-  --library-dir    ${top_builddir}/src/gnc-module
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/report/report-system
+
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -82,7 +90,7 @@ EXTRA_DIST = \
   ${gncscmmod_DATA} \
   ${gncscmtpl_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.business.reports\"
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index 8bd303a..fe0e87f 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -67,10 +67,16 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/scm \
   --guile-load-dir ${top_builddir}/src/tax/us \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -94,7 +100,11 @@ EXTRA_DIST = \
   ${gncscmmod_DATA} \
   ${gncscmrpt_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = \
+	.scm-links \
+	${gncscmmodcache_DATA} \
+	${gncscmrptcache_DATA}
+
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.locale.us\"
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 57a21ab..0e7a566 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -114,10 +114,16 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
   --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/report/report-gnome
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
@@ -133,7 +139,7 @@ endif
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = report .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = report .scm-links ${SCM_FILE_LINKS} ${gncscmmodcache_DATA}
 MAINTAINERCLEANFILES = swig-report-gnome.c
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.gui\"
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index c17760e..d1539f8 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -120,9 +120,15 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
   --library-dir    ${top_builddir}/src/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
@@ -148,7 +154,14 @@ EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA} ${gncmodscm_DATA}
 clean-local:
 	rm -rf gnucash
 
-CLEANFILES = report .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = \
+	report \
+	.scm-links \
+	${SCM_FILE_LINKS} \
+	${gncscmmodcache_DATA} \
+	${gncmodscmcache_DATA} \
+	${gncscmcache_DATA}
+
 MAINTAINERCLEANFILES = swig-report-system.c
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\"
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index 1cb2bef..a39c2e7 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -88,9 +88,15 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
   --library-dir    ${top_builddir}/src/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
@@ -111,9 +117,16 @@ clean-local:
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = ${gncscmmod_DATA} ${gncscmrpt_DATA}
+EXTRA_DIST = \
+	${gncscmmod_DATA} \
+	${gncscmrpt_DATA}
+
+CLEANFILES = \
+	.scm-links \
+	${SCM_FILE_LINK} \
+	${gncscmmodcache_DATA} \
+	${gncscmrptcache_DATA}
 
-CLEANFILES = .scm-links ${SCM_FILE_LINKS}
 DISTCLEANFILES =
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.standard\"
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index 42989f2..c0fcf76 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -75,10 +75,16 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
-  --library-dir    ${top_builddir}/src/gnome-utils
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
+  --library-dir    ${top_builddir}/src/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
@@ -101,7 +107,7 @@ dist_ui_DATA = \
 
 EXTRA_DIST = ${gncscmmod_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\"
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index 8713e4d..6204ea4 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -60,9 +60,15 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/engine \
+  --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module \
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/backend/xml \
+  --library-dir    ${top_builddir}/src/backend/sql \
+  --library-dir    ${top_builddir}/src/html \
   --library-dir    ${top_builddir}/src/report/report-system
 
 %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
@@ -82,7 +88,7 @@ noinst_DATA = .scm-links
 
 EXTRA_DIST = ${gncscmmod_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.util\"
diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am
index 6cb4486..a0bf4fa 100644
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -81,6 +81,7 @@ build-config.scm: ${srcdir}/build-config.scm.in Makefile
             -e 's#@-GNC_HELPDIR-@#${GNC_HELPDIR}#'
 	mv $@.tmp $@
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA}
+
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 MAINTAINERCLEANFILES = build-config.scm
diff --git a/src/scm/gnumeric/Makefile.am b/src/scm/gnumeric/Makefile.am
index dc55ab5..bcb5695 100644
--- a/src/scm/gnumeric/Makefile.am
+++ b/src/scm/gnumeric/Makefile.am
@@ -33,5 +33,6 @@ noinst_DATA = .scm-links
 EXTRA_DIST = \
   ${gncscm_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmcache_DATA}
+
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index d85e3fe..66451d5 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -52,6 +52,8 @@ GUILE_COMPILE_ENV = \
   --guile-load-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/libqof/qof \
+  --library-dir    ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/app-utils \
   --library-dir    ${top_builddir}/src/core-utils \
   --library-dir    ${top_builddir}/src/gnc-module
@@ -78,5 +80,6 @@ EXTRA_DIST = \
   ${gncscmmod_DATA} \
   ${gncscm_DATA}
 
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA}
+
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index e379938..d55cd5e 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -115,7 +115,7 @@ clean-local:
 	$(RM) -rf gnucash
 
 noinst_DATA = .scm-links
-CLEANFILES = .scm-links
+CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 
 EXTRA_DIST = \
   $(SCM_FILES) \



Summary of changes:
 src/app-utils/Makefile.am                 | 14 ++++++++++----
 src/app-utils/business-prefs.scm          |  2 +-
 src/business/business-gnome/Makefile.am   | 16 ++++++++++++++--
 src/core-utils/Makefile.am                |  3 ++-
 src/engine/Makefile.am                    |  9 +++++++--
 src/gnome-utils/Makefile.am               | 11 ++++++++++-
 src/import-export/qif-imp/Makefile.am     | 18 ++++++++++++++++--
 src/libqof/qof/gnc-numeric.c              |  8 ++++----
 src/report/business-reports/Makefile.am   | 12 ++++++++++--
 src/report/locale-specific/us/Makefile.am | 14 ++++++++++++--
 src/report/report-gnome/Makefile.am       |  8 +++++++-
 src/report/report-system/Makefile.am      | 15 ++++++++++++++-
 src/report/standard-reports/Makefile.am   | 17 +++++++++++++++--
 src/report/stylesheets/Makefile.am        | 10 ++++++++--
 src/report/utility-reports/Makefile.am    |  8 +++++++-
 src/scm/Makefile.am                       |  3 ++-
 src/scm/gnumeric/Makefile.am              |  3 ++-
 src/tax/us/Makefile.am                    |  5 ++++-
 src/test-core/Makefile.am                 |  2 +-
 19 files changed, 146 insertions(+), 32 deletions(-)



More information about the gnucash-changes mailing list