IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Guile 2 pre-compilation improvements

Browse Source 
1. Tell the engine to look in the build dir for the backend modules
   Guile compilation loads the engine libraries for
   some guile modules. This triggers the engine
   initialization code which tries to load the xml backend module
   and optionally the dbi module as well.
   By default it looks for these modules in the installed directory
   but during build they are not installed yet, so use a few
   environment variables to tell the engine to look in the build
   dir instead.

2. Wait for the c library to be linked before attempting to
   compile the guile files. Some guile files need the library
   to be available.

Note that neither fix is necessary for all directories that has
scheme files to compile. For consistency between makefiles, I have
chosen to add them to all, which won't hurt.
This commit is contained in:
Geert Janssens
2014-10-30 17:54:36 +01:00
parent 97f8f39dc6
commit be0e3581c2
16 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app-utils/Makefile.am
View File

@@ -214,7 +214,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/business/business-gnome/Makefile.am
View File

@@ -130,7 +130,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/core-utils/Makefile.am
View File

@@ -116,7 +116,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/engine/Makefile.am
View File

@@ -196,7 +196,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/gnc-module/Makefile.am
View File

@@ -69,7 +69,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/gnome-utils/Makefile.am
View File

@@ -283,7 +283,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/import-export/qif-imp/Makefile.am
View File

@@ -108,7 +108,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

5
src/report/business-reports/Makefile.am
View File

@@ -50,6 +50,7 @@ GUILE_COMPILE_ENV = \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/engine \
@@ -62,7 +63,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/report/locale-specific/us/Makefile.am
View File

@@ -72,7 +72,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/report/report-gnome/Makefile.am
View File

@@ -120,7 +120,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/report/report-gnome
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/report/report-system/Makefile.am
View File

@@ -125,7 +125,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/report/standard-reports/Makefile.am
View File

@@ -93,7 +93,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/report/stylesheets/Makefile.am
View File

@@ -80,7 +80,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

6
src/report/utility-reports/Makefile.am
View File

@@ -50,12 +50,14 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/gnc-module \
--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/app-utils \
@@ -63,7 +65,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/tax/us/Makefile.am
View File

@@ -56,7 +56,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<

4
src/test-core/Makefile.am
View File

@@ -101,7 +101,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/test-core
%.go : %.scm .scm-links
%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
GNC_UNINSTALLED=yes \
GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<