Reapply fix of Guile precompilation without unwanted change in gnc-numeric.c.

This commit is contained in:
John Ralls 2014-12-02 08:24:57 -08:00
parent 9bcc1ad6ce
commit afdf0de542
18 changed files with 142 additions and 28 deletions

View File

@ -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\"

View File

@ -19,7 +19,7 @@
;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
;; Boston, MA 02110-1301, USA gnu@gnu.org
(use-modules (gnucash gettext))
(use-modules (gnucash app-utils))
(define gnc:*option-section-counters* (N_ "Counters"))

View File

@ -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\"

View File

@ -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}\""

View File

@ -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:

View File

@ -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.

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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

View File

@ -33,5 +33,6 @@ noinst_DATA = .scm-links
EXTRA_DIST = \
${gncscm_DATA}
CLEANFILES = .scm-links
CLEANFILES = .scm-links ${gncscmcache_DATA}
DISTCLEANFILES = ${SCM_FILE_LINKS}

View File

@ -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}

View File

@ -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) \