From ca9485f5d966ae3611d58cec10b01e0f45eef3d9 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Tue, 29 Aug 2006 08:05:33 +0000 Subject: [PATCH] Next round of Makefile symlink cleanup. Scheme files are now symlinked or copied into subdirectories gnucash/ and g-wrapped/. Also, parallel builds should work fine now. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14764 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/report/locale-specific/us/Makefile.am | 16 ++++++++++------ src/report/report-gnome/Makefile.am | 20 +++++++++++++++----- src/report/report-system/Makefile.am | 20 +++++++++++++++----- src/report/standard-reports/Makefile.am | 12 ++++++++---- src/report/stylesheets/Makefile.am | 12 ++++++++---- src/report/utility-reports/Makefile.am | 12 ++++++++---- 6 files changed, 64 insertions(+), 28 deletions(-) diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am index a787fd1461..aca1f577da 100644 --- a/src/report/locale-specific/us/Makefile.am +++ b/src/report/locale-specific/us/Makefile.am @@ -31,23 +31,27 @@ SCM_FILE_LINKS = \ endif .scm-links: - rm -f gnucash report locale-specific us - $(LN_S) -f . gnucash - $(LN_S) -f . report - $(LN_S) -f ${srcdir} locale-specific - $(LN_S) -f . us + $(RM) -rf gnucash + mkdir -p gnucash + mkdir -p gnucash/report + mkdir -p gnucash/report/locale-specific if GNUCASH_SEPARATE_BUILDDIR for X in ${SCM_FILE_LINKS} ; do \ $(LN_S) -f ${srcdir}/$$X . ; \ done endif + ( cd gnucash/report/locale-specific; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../../$$A . ; done ) + ( cd gnucash/report; for A in $(gncscmothermod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash + noinst_DATA = .scm-links EXTRA_DIST = \ ${gncscmothermod_DATA} \ ${gncscmmod_DATA} -CLEANFILES = gnucash report locale-specific us .scm-links +CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am index bce7082929..3e69312328 100644 --- a/src/report/report-gnome/Makefile.am +++ b/src/report/report-gnome/Makefile.am @@ -88,18 +88,26 @@ SCM_FILE_LINKS += ${gncmod_DATA} endif .scm-links: - rm -f gnucash g-wrapped - $(LN_S) -f . gnucash - $(LN_S) -f . g-wrapped - $(LN_S) -f ${srcdir} report + $(RM) -rf gnucash g-wrapped + mkdir -p gnucash g-wrapped + 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 $(gncmod_DATA) ; do $(LN_S) -f ../../$$A . ; done ) touch .scm-links +clean-local: + $(RM) -rf gnucash g-wrapped + +.INTERMEDIATE: gwrap-files + gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: \ + gwrap-files + +gwrap-files: \ .scm-links gw-report-gnome-spec.scm ${top_builddir}/config.status FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ @@ -110,7 +118,9 @@ gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: \ (set! %load-path (cons \"${top_builddir}/src/gnome\" %load-path)) \ (primitive-load \"./gw-report-gnome-spec.scm\") \ (gw:generate-wrapset \"gw-report-gnome\")" + touch $@ + ( cd g-wrapped; $(LN_S) -f ../gw-*.scm . ) BUILT_SOURCES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h -CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \ +CLEANFILES = $(BUILT_SOURCES) .scm-links \ ${SCM_FILE_LINKS} gw-report-gnome.html diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am index df49a58d09..15e36b1389 100644 --- a/src/report/report-system/Makefile.am +++ b/src/report/report-system/Makefile.am @@ -57,17 +57,22 @@ SCM_FILE_LINKS += \ endif .scm-links: - rm -f gnucash report g-wrapped - $(LN_S) -f . gnucash - $(LN_S) -f . report - $(LN_S) -f . g-wrapped + $(RM) -rf gnucash g-wrapped + mkdir -p gnucash g-wrapped + 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 g-wrapped + +.INTERMEDIATE: gwrap-files + nodist_libgw_report_system_la_SOURCES = gw-report-system.c libgw_report_system_la_LIBADD = \ libgncmod-report-system.la \ @@ -82,6 +87,9 @@ noinst_DATA = .scm-links gw-report-system.h EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA} gw-report-system.scm gw-report-system.c gw-report-system.h: \ + gwrap-files + +gwrap-files: \ .scm-links gw-report-system-spec.scm ${top_builddir}/config.status FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ @@ -91,7 +99,9 @@ gw-report-system.scm gw-report-system.c gw-report-system.h: \ (set! %load-path (cons \"${top_builddir}/src/gnome-utils\" %load-path)) \ (primitive-load \"./gw-report-system-spec.scm\") \ (gw:generate-wrapset \"gw-report-system\")" + touch $@ + ( cd g-wrapped; $(LN_S) -f ../gw-*.scm . ) BUILT_SOURCES = gw-report-system.scm gw-report-system.c gw-report-system.h -CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \ +CLEANFILES = $(BUILT_SOURCES) .scm-links \ ${SCM_FILE_LINKS} gw-report-system.html diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am index 85781e701d..9a65333d45 100644 --- a/src/report/standard-reports/Makefile.am +++ b/src/report/standard-reports/Makefile.am @@ -43,19 +43,23 @@ 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/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am index a09000cfd7..2518beb549 100644 --- a/src/report/stylesheets/Makefile.am +++ b/src/report/stylesheets/Makefile.am @@ -45,16 +45,20 @@ 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 uidir = $(GNC_UI_DIR) @@ -63,5 +67,5 @@ dist_ui_DATA = \ EXTRA_DIST = ${gncscmmod_DATA} -CLEANFILES = gnucash report .scm-links +CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am index 22cdc7ba43..7f1db48328 100644 --- a/src/report/utility-reports/Makefile.am +++ b/src/report/utility-reports/Makefile.am @@ -32,19 +32,23 @@ SCM_FILE_LINKS = \ 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}