From a99e9001610969e202ef53f41207e4472bbb8e80 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Wed, 6 Sep 2006 09:35:30 +0000 Subject: [PATCH] Last round of Makefile and symlink cleanup. Gnucash should build fine without symlinks now. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14804 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/business/business-core/Makefile.am | 18 ++++++++++++++---- src/business/business-gnome/Makefile.am | 18 ++++++++++++++---- src/business/business-reports/Makefile.am | 12 ++++++++---- src/business/business-utils/Makefile.am | 10 +++++++--- src/business/dialog-tax-table/Makefile.am | 18 ++++++++++++++---- 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am index aec93a0386..efd6041aae 100644 --- a/src/business/business-core/Makefile.am +++ b/src/business/business-core/Makefile.am @@ -100,17 +100,25 @@ SCM_FILE_LINKS += ${gncmod_DATA} endif .scm-links: - rm -f gnucash g-wrapped - $(LN_S) -f . gnucash - $(LN_S) -f . g-wrapped + $(RM) -rf gnucash g-wrapped + mkdir -p gnucash g-wrapped if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash g-wrapped + +.INTERMEDIATE: gwrap-files + gw-business-core.scm gw-business-core.c gw-business-core.h: \ + gwrap-files + +gwrap-files: \ .scm-links gw-business-core-spec.scm ${top_builddir}/config.status FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ @@ -118,7 +126,9 @@ gw-business-core.scm gw-business-core.c gw-business-core.h: \ (set! %load-path (cons \"../../engine\" %load-path)) \ (primitive-load \"./gw-business-core-spec.scm\") \ (gw:generate-wrapset \"gw-business-core\")" + touch $@ + ( cd g-wrapped; $(LN_S) -f ../gw-*.scm . ) BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h CLEANFILES = $(BUILT_SOURCES) gw-business-core.html \ - g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} + .scm-links ${SCM_FILE_LINKS} diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am index 0593c18e04..ca34cc827a 100644 --- a/src/business/business-gnome/Makefile.am +++ b/src/business/business-gnome/Makefile.am @@ -123,17 +123,25 @@ SCM_FILE_LINKS += ${gncmod_DATA} endif .scm-links: - rm -f gnucash g-wrapped - $(LN_S) -f . gnucash - $(LN_S) -f . g-wrapped + $(RM) -rf gnucash g-wrapped + mkdir -p gnucash g-wrapped if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash g-wrapped + +.INTERMEDIATE: gwrap-files + gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \ + gwrap-files + +gwrap-files: \ .scm-links gw-business-gnome-spec.scm ${top_builddir}/config.status FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ @@ -145,7 +153,9 @@ gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \ (set! %load-path (cons \"../../gnome-utils\" %load-path)) \ (primitive-load \"./gw-business-gnome-spec.scm\") \ (gw:generate-wrapset \"gw-business-gnome\")" + touch $@ + ( cd g-wrapped; $(LN_S) -f ../gw-*.scm . ) BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h -CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \ +CLEANFILES = $(BUILT_SOURCES) .scm-links \ ${SCM_FILE_LINKS} gw-business-gnome.html diff --git a/src/business/business-reports/Makefile.am b/src/business/business-reports/Makefile.am index 1de5284454..189740b500 100644 --- a/src/business/business-reports/Makefile.am +++ b/src/business/business-reports/Makefile.am @@ -14,20 +14,24 @@ SCM_FILE_LINKS = ${gncscmmod_DATA} endif .scm-links: - rm -f gnucash report - $(LN_S) -f . gnucash - $(LN_S) -f ${srcdir} report + $(RM) -rf gnucash + mkdir -p gnucash + mkdir -p gnucash/report if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash + noinst_DATA = .scm-links EXTRA_DIST = \ ${gncscmmod_DATA} -CLEANFILES = gnucash report .scm-links +CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/src/business/business-utils/Makefile.am b/src/business/business-utils/Makefile.am index f25256fd12..e721e97f75 100644 --- a/src/business/business-utils/Makefile.am +++ b/src/business/business-utils/Makefile.am @@ -50,14 +50,18 @@ SCM_FILE_LINKS = business-utils.scm \ endif .scm-links: - rm -f gnucash - $(LN_S) -f ${srcdir} gnucash + $(RM) -rf gnucash + mkdir -p gnucash if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) touch .scm-links -CLEANFILES = gnucash .scm-links +clean-local: + $(RM) -rf gnucash + +CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am index 6505843831..26c19980a3 100644 --- a/src/business/dialog-tax-table/Makefile.am +++ b/src/business/dialog-tax-table/Makefile.am @@ -73,17 +73,25 @@ SCM_FILE_LINKS += ${gncmod_DATA} endif .scm-links: - rm -f gnucash g-wrapped - $(LN_S) -f . gnucash - $(LN_S) -f . g-wrapped + $(RM) -rf gnucash g-wrapped + mkdir -p gnucash g-wrapped if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash g-wrapped + +.INTERMEDIATE: gwrap-files + gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \ + gwrap-files + +gwrap-files: \ .scm-links gw-dialog-tax-table-spec.scm ${top_builddir}/config.status FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ @@ -94,8 +102,10 @@ gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \ (set! %load-path (cons \"../../gnome-utils\" %load-path)) \ (primitive-load \"./gw-dialog-tax-table-spec.scm\") \ (gw:generate-wrapset \"gw-dialog-tax-table\")" + touch $@ + ( cd g-wrapped; $(LN_S) -f ../gw-*.scm . ) BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \ gw-dialog-tax-table.h -CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \ +CLEANFILES = $(BUILT_SOURCES) .scm-links \ ${SCM_FILE_LINKS} gw-dialog-tax-table.html