[Gnucash-changes] r13281 - gnucash/trunk - Make the build work if
the build directory is not the source
Derek Atkins
warlord at cvs.gnucash.org
Fri Feb 17 15:29:03 EST 2006
Author: warlord
Date: 2006-02-17 15:22:54 -0500 (Fri, 17 Feb 2006)
New Revision: 13281
Trac: http://svn.gnucash.org/trac/changeset/13281
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/intl-scm/Makefile.am
gnucash/trunk/lib/guile-www/Makefile.am
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/business-reports/Makefile.am
gnucash/trunk/src/business/business-utils/Makefile.am
gnucash/trunk/src/business/dialog-tax-table/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/hbci/Makefile.am
gnucash/trunk/src/import-export/qif-import/Makefile.am
gnucash/trunk/src/import-export/qif-io-core/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/report/locale-specific/us/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
gnucash/trunk/src/report/standard-reports/Makefile.am
gnucash/trunk/src/report/stylesheets/Makefile.am
gnucash/trunk/src/report/utility-reports/Makefile.am
gnucash/trunk/src/scm/Makefile.am
gnucash/trunk/src/scm/gnumeric/Makefile.am
gnucash/trunk/src/scm/printing/Makefile.am
gnucash/trunk/src/tax/us/Makefile.am
Log:
Make the build work if the build directory is not the source
directory. Also symlink .scm files into the build directory
so it's possible to run from it.
Also fix "fin.scm installed twice", bug #168629.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/ChangeLog 2006-02-17 20:22:54 UTC (rev 13281)
@@ -1,3 +1,38 @@
+2006-02-17 Derek Atkins <derek at ihtfp.com>
+
+ * intl-scm/Makefile.am:
+ * lib/guile-www/Makefile.am:
+ * src/app-utils/Makefile.am:
+ * src/business/business-core/Makefile.am:
+ * src/business/business-gnome/Makefile.am:
+ * src/business/business-reports/Makefile.am:
+ * src/business/business-utils/Makefile.am:
+ * src/business/dialog-tax-table/Makefile.am:
+ * src/core-utils/Makefile.am:
+ * src/engine/Makefile.am:
+ * src/gnc-module/Makefile.am:
+ * src/gnome/Makefile.am:
+ * src/gnome-utils/Makefile.am:
+ * src/import-export/hbci/Makefile.am:
+ * src/import-export/Makefile.am:
+ * src/import-export/qif-import/Makefile.am:
+ * src/import-export/qif-io-core/Makefile.am:
+ * src/register/register-core/Makefile.am:
+ * src/report/locale-specific/us/Makefile.am:
+ * src/report/report-gnome/Makefile.am:
+ * src/report/report-system/Makefile.am:
+ * src/report/standard-reports/Makefile.am:
+ * src/report/stylesheets/Makefile.am:
+ * src/report/utility-reports/Makefile.am:
+ * src/scm/gnumeric/Makefile.am:
+ * src/scm/Makefile.am:
+ * src/scm/printing/Makefile.am:
+ * src/tax/us/Makefile.am:
+ Make the build work if the build directory is not the source
+ directory. Also symlink .scm files into the build directory
+ so it's possible to run from it.
+ Also fix "fin.scm installed twice", bug #168629.
+
2006-02-15 Derek Atkins <derek at ihtfp.com>
* configure.in: get --disable-gui to actually do what we want.
Modified: gnucash/trunk/intl-scm/Makefile.am
===================================================================
--- gnucash/trunk/intl-scm/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/intl-scm/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -1,3 +1,5 @@
+abs_top_srcdir=@abs_top_srcdir@
+
EXTRA_DIST = \
guile-strings.c \
xgettext.scm
@@ -8,7 +10,7 @@
BUILT_SOURCES = guile-strings.c
-SCMFILES = $(shell find ${top_srcdir}/src -name test -prune -o -name '*.scm' -print )
+SCMFILES = $(shell find ${abs_top_srcdir}/src -name test -prune -o -name '*.scm' -print )
# This needs to be generated in srcdir
guile-strings.c: $(SCMFILES)
Modified: gnucash/trunk/lib/guile-www/Makefile.am
===================================================================
--- gnucash/trunk/lib/guile-www/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/lib/guile-www/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -10,13 +10,23 @@
noinst_DATA = .scm-links
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = ${gncscm_DATA}
+endif
+
.scm-links:
rm -f www
ln -sf . www
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
+
CLEANFILES = www .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
endif # GNC_HAVE_GUILE_WWW (else clause)
EXTRA_DIST = README README.gnucash wwwcat cgi.scm http.scm main.scm url.scm
-
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/app-utils/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -107,7 +107,9 @@
#For compiling
SCM_FILE_LINKS = gw-app-utils-spec.scm
#For executing test cases
-SCM_FILE_LINKS += app-utils.scm
+SCM_FILE_LINKS += \
+ ${gncmod_DATA} \
+ ${gncscm_DATA}
endif
.scm-links:
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -85,7 +85,7 @@
#For compiling
SCM_FILE_LINKS = gw-business-core-spec.scm
#For executing test cases
-SCM_FILE_LINKS += business-core.scm
+SCM_FILE_LINKS += ${gncmod_DATA}
endif
.scm-links:
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -104,7 +104,10 @@
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
+#for compiling
SCM_FILE_LINKS = gw-business-gnome-spec.scm
+#for running
+SCM_FILE_LINKS += ${gncmod_DATA}
endif
.scm-links:
@@ -132,6 +135,5 @@
(gw:generate-wrapset \"gw-business-gnome\")"
BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
-DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
- gw-business-gnome.html
-
+CLEANFILES = g-wrapped gnucash .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-business-gnome.html
Modified: gnucash/trunk/src/business/business-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-reports/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/business/business-reports/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -1,11 +1,3 @@
-.scm-links:
- rm -f gnucash report
- ln -sf . gnucash
- ln -sf ${srcdir} report
- touch .scm-links
-
-noinst_DATA = .scm-links
-
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
gncscmmod_DATA = \
business-reports.scm \
@@ -17,7 +9,25 @@
invoice.scm \
owner-report.scm
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = ${gncscmmod_DATA}
+endif
+
+.scm-links:
+ rm -f gnucash report
+ ln -sf . gnucash
+ ln -sf ${srcdir} report
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+noinst_DATA = .scm-links
+
EXTRA_DIST = \
${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/business/business-utils/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -41,9 +41,20 @@
noinst_DATA = .scm-links
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = business-utils.scm \
+ ${gncscm_DATA}
+endif
+
.scm-links:
rm -f gnucash
ln -sf ${srcdir} gnucash
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
-DISTCLEANFILES = gnucash .scm-links
+CLEANFILES = gnucash .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -61,7 +61,10 @@
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
+# for compline
SCM_FILE_LINKS = gw-dialog-tax-table-spec.scm
+# for running
+SCM_FILE_LINKS += ${gncmod_DATA}
endif
.scm-links:
@@ -89,5 +92,5 @@
BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \
gw-dialog-tax-table.h
-DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
- gw-dialog-tax-table.html
+CLEANFILES = g-wrapped gnucash .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-dialog-tax-table.html
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/core-utils/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -67,5 +67,5 @@
(gw:generate-wrapset \"gw-core-utils\")"
BUILT_SOURCES = gw-core-utils.scm gw-core-utils.h gw-core-utils.c
-DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
- gw-core-utils.html
+CLEANFILES = g-wrapped gnucash .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-core-utils.html
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/engine/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -151,7 +151,9 @@
#For compiling
SCM_FILE_LINKS = gw-engine-spec.scm gw-kvp-spec.scm iso-4217-currencies.scm
#For executing test cases
-SCM_FILE_LINKS += engine.scm
+SCM_FILE_LINKS += \
+ ${gncmod_DATA} \
+ ${gncscm_DATA}
endif
.scm-links:
@@ -190,8 +192,8 @@
gw-engine.scm gw-engine.c gw-engine.h \
gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
-DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
- gw-engine.html gw-kvp.html gncla-dir.h
+CLEANFILES = gnucash g-wrapped .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-engine.html gw-kvp.html gncla-dir.h
gncla-dir.h: gncla-dir.h.in
rm -f $@.tmp
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -49,7 +49,7 @@
#For compiling
SCM_FILE_LINKS = gw-gnc-module-spec.scm
#For executing test cases
-SCM_FILE_LINKS += gnc-module.scm
+SCM_FILE_LINKS += ${gncmod_DATA}
endif
.scm-links:
@@ -71,7 +71,5 @@
(gw:generate-wrapset \"gw-gnc-module\")"
BUILT_SOURCES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c
-DISTCLEANFILES = .scm-links g-wrapped gnucash ${SCM_FILE_LINKS} \
- gw-gnc-module.html
-
-
+CLEANFILES = .scm-links g-wrapped gnucash
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc-module.html
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/gnome/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -195,6 +195,5 @@
(primitive-load \"./gw-gnc-spec.scm\") \
(gw:generate-wrapset \"gw-gnc\")"
BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
-CLEANFILES = gnucash.keys gnucash.desktop
-DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
- gw-gnc.html
+CLEANFILES = gnucash.keys gnucash.desktop gnucash g-wrapped .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc.html
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -280,7 +280,9 @@
#For compiling
SCM_FILE_LINKS = gw-gnome-utils-spec.scm
#For executing test cases
-SCM_FILE_LINKS += gnome-utils-spec.scm gnome-utils.scm
+SCM_FILE_LINKS += \
+ ${gncmod_DATA} \
+ ${gncscm_DATA}
endif
.scm-links:
@@ -305,8 +307,8 @@
(gw:generate-wrapset \"gw-gnome-utils\")"
BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h
-DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
- gw-gnome-utils.html gnc-svninfo.h
+CLEANFILES = gnucash g-wrapped .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnome-utils.html
#
# I hate inconsistent standards. Autotools puts help files into
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/import-export/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -77,7 +77,7 @@
#For compiling
SCM_FILE_LINKS =
#For executing test cases
-SCM_FILE_LINKS += generic-import.scm
+SCM_FILE_LINKS +=
endif
noinst_DATA = .scm-links
@@ -88,6 +88,12 @@
ln -sf . gnucash
ln -sf . generic-import
ln -sf . g-wrapped
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
-DISTCLEANFILES = gnucash generic-import g-wrapped .scm-links import-export
+CLEANFILES = gnucash generic-import g-wrapped .scm-links import-export
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/import-export/hbci/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -82,5 +82,3 @@
gnc-plugin-hbci-ui.xml
EXTRA_DIST = ${gncscm_DATA} ${libgncmod_hbci_la_empty} ${ui_DATA}
-
-CLEANFILES = gnucash g-wrapped .scm-links
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -78,6 +78,11 @@
CLEANFILES =
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = \
+ ${gncscm_DATA}
+endif
+
noinst_DATA = .scm-links
.scm-links:
@@ -86,5 +91,12 @@
ln -sf . import-export
ln -sf . gnucash
ln -sf . g-wrapped
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
+
CLEANFILES += qif-import import-export gnucash g-wrapped .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/import-export/qif-io-core/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/import-export/qif-io-core/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -8,15 +8,6 @@
noinst_DATA = .scm-links
-.scm-links:
- rm -f gnucash import-export
- ln -sf . gnucash
- ln -sf . import-export
- touch .scm-links
-
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export/
-gncscmmod_DATA = qif-io-core.scm
-
gncscmdir = ${GNC_SHAREDIR}/scm
gncscm_DATA = \
qif-acct-table.scm \
@@ -28,4 +19,24 @@
qif-parse.scm \
qif-record-xform.scm
-DISTCLEANFILES = gnucash import-export .scm-links
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = \
+ ${gncscm_DATA}
+endif
+
+.scm-links:
+ rm -f gnucash import-export
+ ln -sf . gnucash
+ ln -sf . import-export
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export/
+gncscmmod_DATA = qif-io-core.scm
+
+CLEANFILES = gnucash import-export .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -101,5 +101,5 @@
(gw:generate-wrapset \"gw-register-core\")"
BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
-DISTCLEANFILES = gnucash g-wrapped register .scm-links ${SCM_FILE_LINKS} \
- gw-register-core.html
+CLEANFILES = gnucash g-wrapped register .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-register-core.html
Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -16,9 +16,18 @@
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
+## This is unused and therefore no longer installed and/or loaded
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific
+gncscmmod_DATA = us.scm de_DE.scm
+
+gncscmothermoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmothermod_DATA = taxtxf.scm taxtxf-de_DE.scm
+
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
-SCM_FILE_LINKS = taxtxf.scm
+SCM_FILE_LINKS = \
+ ${gncscmmod_DATA} \
+ ${gncscmothermod_DATA}
endif
.scm-links:
@@ -36,15 +45,9 @@
noinst_DATA = .scm-links
-## This is unused and therefore no longer installed and/or loaded
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific
-gncscmmod_DATA = us.scm de_DE.scm
-
-gncscmothermoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
-gncscmothermod_DATA = taxtxf.scm taxtxf-de_DE.scm
-
EXTRA_DIST = \
${gncscmothermod_DATA} \
${gncscmmod_DATA}
-CLEANFILES = ${SCM_FILE_LINKS} gnucash report locale-specific us .scm-links
+CLEANFILES = gnucash report locale-specific us .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -80,7 +80,10 @@
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
+# for compiling
SCM_FILE_LINKS = gw-report-gnome-spec.scm
+# for running
+SCM_FILE_LINKS += ${gncmod_DATA}
endif
.scm-links:
@@ -108,5 +111,5 @@
(gw:generate-wrapset \"gw-report-gnome\")"
BUILT_SOURCES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h
-DISTCLEANFILES = gnucash g-wrapped report .scm-links ${SCM_FILE_LINKS} \
- gw-report-gnome.html
+CLEANFILES = gnucash g-wrapped report .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-gnome.html
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -24,9 +24,36 @@
${GLIB_CFLAGS} ${GUILE_INCS} \
${G_WRAP_COMPILE_ARGS}
+gncscmdir = ${GNC_SHAREDIR}/scm
+gncscm_DATA = \
+ commodity-utilities.scm \
+ html-acct-table.scm \
+ html-barchart.scm \
+ html-document.scm \
+ html-piechart.scm \
+ html-scatter.scm \
+ html-style-info.scm \
+ html-style-sheet.scm \
+ html-table.scm \
+ html-text.scm \
+ html-utilities.scm \
+ options-utilities.scm \
+ report-utilities.scm \
+ report.scm
+
+gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report-system
+
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmod_DATA = report-system.scm
+
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
-SCM_FILE_LINKS = report-system.scm gw-report-system-spec.scm
+# for compiling
+SCM_FILE_LINKS = gw-report-system-spec.scm
+# for running
+SCM_FILE_LINKS += \
+ ${gncscmmod_DATA} \
+ ${gncscm_DATA}
endif
.scm-links:
@@ -41,11 +68,6 @@
endif
touch .scm-links
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report-system
-
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
-gncscmmod_DATA = report-system.scm
-
libgw_report_system_la_SOURCES = gw-report-system.c
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = gw-report-system.scm gw-report-system-spec.scm
@@ -53,23 +75,6 @@
noinst_HEADERS = gw-report-system.h
noinst_DATA = .scm-links gw-report-system.h
-gncscmdir = ${GNC_SHAREDIR}/scm
-gncscm_DATA = \
- commodity-utilities.scm \
- html-acct-table.scm \
- html-barchart.scm \
- html-document.scm \
- html-piechart.scm \
- html-scatter.scm \
- html-style-info.scm \
- html-style-sheet.scm \
- html-table.scm \
- html-text.scm \
- html-utilities.scm \
- options-utilities.scm \
- report-utilities.scm \
- report.scm
-
EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA}
CLEANFILES = ${SCM_FILE_LINKS} gnucash report .scm-links
@@ -87,5 +92,5 @@
(gw:generate-wrapset \"gw-report-system\")"
BUILT_SOURCES = gw-report-system.scm gw-report-system.c gw-report-system.h
-DISTCLEANFILES = gnucash g-wrapped report .scm-links ${SCM_FILE_LINKS} \
- gw-report-system.html
+CLEANFILES = gnucash g-wrapped report .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-system.html
Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -10,14 +10,6 @@
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
-.scm-links:
- rm -f gnucash report
- ln -sf . gnucash
- ln -sf ${srcdir} report
- touch .scm-links
-
-noinst_DATA = .scm-links
-
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
gncscmmod_DATA = \
account-piecharts.scm \
@@ -41,6 +33,25 @@
general-ledger.scm \
transaction.scm
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = ${gncscmmod_DATA}
+endif
+
+.scm-links:
+ rm -f gnucash report
+ ln -sf . gnucash
+ ln -sf ${srcdir} report
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+noinst_DATA = .scm-links
+
EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -27,21 +27,31 @@
${QOF_CFLAGS} \
${GNOME_CFLAGS}
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmod_DATA = \
+ stylesheets.scm \
+ stylesheet-plain.scm \
+ stylesheet-fancy.scm \
+ stylesheet-easy.scm
+
+if GNUCASH_SEPARATE_BUILDDIR
+#For executing test cases
+SCM_FILE_LINKS = ${gncscmmod_DATA}
+endif
+
.scm-links:
rm -f gnucash report
ln -sf . gnucash
ln -sf ${srcdir} report
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
noinst_DATA = .scm-links
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
-gncscmmod_DATA = \
- stylesheets.scm \
- stylesheet-plain.scm \
- stylesheet-fancy.scm \
- stylesheet-easy.scm
-
uidir = $(GNC_UI_DIR)
dist_ui_DATA = \
gnc-plugin-stylesheets-ui.xml
@@ -49,4 +59,4 @@
EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links
-
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -12,14 +12,6 @@
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
-.scm-links:
- rm -f gnucash report
- ln -sf . gnucash
- ln -sf ${srcdir} report
- touch .scm-links
-
-noinst_DATA = .scm-links
-
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
gncscmmod_DATA = \
hello-world.scm \
@@ -29,6 +21,26 @@
welcome-to-gnucash.scm \
test-graphing.scm
+if GNUCASH_SEPARATE_BUILDDIR
+#For separate build directory
+SCM_FILE_LINKS = \
+ ${gncscmmod_DATA}
+endif
+
+.scm-links:
+ rm -f gnucash report
+ ln -sf . gnucash
+ ln -sf ${srcdir} report
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+noinst_DATA = .scm-links
+
EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/scm/Makefile.am
===================================================================
--- gnucash/trunk/src/scm/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/scm/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -4,10 +4,9 @@
gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncscmmod_DATA = process.scm main.scm price-quotes.scm fin.scm
+gncscmmod_DATA = process.scm main.scm price-quotes.scm
gnc_regular_scm_files = \
- build-config.scm \
command-line.scm \
doc.scm \
fin.scm \
@@ -16,16 +15,29 @@
substring-search.scm \
xml-generator.scm
-gncscm_DATA = ${gnc_regular_scm_files}
+gncscm_DATA = \
+ build-config.scm \
+ ${gnc_regular_scm_files}
noinst_DATA = .scm-links
configdir = ${GNC_CONFIGDIR}
config_DATA = config
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = \
+ ${gncscmmod_DATA} \
+ ${gnc_regular_scm_files}
+endif
+
.scm-links:
rm -f gnucash
ln -sf ${srcdir} gnucash
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
touch .scm-links
SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}
@@ -47,5 +59,6 @@
-e 's:@-GNC_HELPDIR-@:${GNC_HELPDIR}:'
mv $@.tmp $@
-DISTCLEANFILES = gnucash .scm-links
+CLEANFILES = gnucash .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = build-config.scm
Modified: gnucash/trunk/src/scm/gnumeric/Makefile.am
===================================================================
--- gnucash/trunk/src/scm/gnumeric/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/scm/gnumeric/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -1,9 +1,25 @@
-
gncscmdir = ${GNC_SCM_INSTALL_DIR}/gnumeric
-
gncscm_DATA = \
gnumeric-utilities.scm \
table-utils.scm
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = \
+ ${gncscm_DATA}
+endif
+
+.scm-links:
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+noinst_DATA = .scm-links
+
EXTRA_DIST = \
${gncscm_DATA}
+
+CLEANFILES = .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/scm/printing/Makefile.am
===================================================================
--- gnucash/trunk/src/scm/printing/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/scm/printing/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -1,8 +1,25 @@
-
gncscmdir = ${GNC_SCM_INSTALL_DIR}/printing
gncscm_DATA = print-check.scm
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/printing
gncscmmod_DATA = number-to-words.scm
+if GNUCASH_SEPARATE_BUILDDIR
+SCM_FILE_LINKS = \
+ ${gncscmmod_DATA} \
+ ${gncscm_DATA}
+endif
+
+.scm-links:
+if GNUCASH_SEPARATE_BUILDDIR
+ for X in ${SCM_FILE_LINKS} ; do \
+ ln -sf ${srcdir}/$$X . ; \
+ done
+endif
+ touch .scm-links
+
+noinst_DATA = .scm-links
+
EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA}
+CLEANFILES = .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/tax/us/Makefile.am
===================================================================
--- gnucash/trunk/src/tax/us/Makefile.am 2006-02-17 15:03:23 UTC (rev 13280)
+++ gnucash/trunk/src/tax/us/Makefile.am 2006-02-17 20:22:54 UTC (rev 13281)
@@ -14,9 +14,17 @@
-I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} ${GUILE_INCS}
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax
+gncscmmod_DATA = us.scm de_DE.scm
+
+gncscmdir = ${GNC_SHAREDIR}/scm
+gncscm_DATA = txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm
+
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
-SCM_FILE_LINKS = us.scm de_DE.scm
+SCM_FILE_LINKS = \
+ ${gncscmmod_DATA} \
+ ${gncscm_DATA}
endif
.scm-links:
@@ -32,14 +40,9 @@
noinst_DATA = .scm-links
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax
-gncscmmod_DATA = us.scm de_DE.scm
-
-gncscmdir = ${GNC_SHAREDIR}/scm
-gncscm_DATA = txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm
-
EXTRA_DIST = \
${gncscmmod_DATA} \
${gncscm_DATA}
-CLEANFILES = ${SCM_FILE_LINKS} gnucash tax .scm-links
+CLEANFILES = gnucash tax .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS}
More information about the gnucash-changes
mailing list