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
This commit is contained in:
Christian Stimming 2006-08-29 08:05:33 +00:00
parent 03224e7748
commit ca9485f5d9
6 changed files with 64 additions and 28 deletions

View File

@ -31,23 +31,27 @@ SCM_FILE_LINKS = \
endif endif
.scm-links: .scm-links:
rm -f gnucash report locale-specific us $(RM) -rf gnucash
$(LN_S) -f . gnucash mkdir -p gnucash
$(LN_S) -f . report mkdir -p gnucash/report
$(LN_S) -f ${srcdir} locale-specific mkdir -p gnucash/report/locale-specific
$(LN_S) -f . us
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif 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 touch .scm-links
clean-local:
$(RM) -rf gnucash
noinst_DATA = .scm-links noinst_DATA = .scm-links
EXTRA_DIST = \ EXTRA_DIST = \
${gncscmothermod_DATA} \ ${gncscmothermod_DATA} \
${gncscmmod_DATA} ${gncscmmod_DATA}
CLEANFILES = gnucash report locale-specific us .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}

View File

@ -88,18 +88,26 @@ SCM_FILE_LINKS += ${gncmod_DATA}
endif endif
.scm-links: .scm-links:
rm -f gnucash g-wrapped $(RM) -rf gnucash g-wrapped
$(LN_S) -f . gnucash mkdir -p gnucash g-wrapped
$(LN_S) -f . g-wrapped mkdir -p gnucash/report
$(LN_S) -f ${srcdir} report
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif endif
( cd gnucash/report; for A in $(gncmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
touch .scm-links 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: \ 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 .scm-links gw-report-gnome-spec.scm ${top_builddir}/config.status
FLAVOR=gnome $(GUILE) -c \ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ "(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)) \ (set! %load-path (cons \"${top_builddir}/src/gnome\" %load-path)) \
(primitive-load \"./gw-report-gnome-spec.scm\") \ (primitive-load \"./gw-report-gnome-spec.scm\") \
(gw:generate-wrapset \"gw-report-gnome\")" (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 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 ${SCM_FILE_LINKS} gw-report-gnome.html

View File

@ -57,17 +57,22 @@ SCM_FILE_LINKS += \
endif endif
.scm-links: .scm-links:
rm -f gnucash report g-wrapped $(RM) -rf gnucash g-wrapped
$(LN_S) -f . gnucash mkdir -p gnucash g-wrapped
$(LN_S) -f . report mkdir -p gnucash/report
$(LN_S) -f . g-wrapped
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif endif
( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf gnucash g-wrapped
.INTERMEDIATE: gwrap-files
nodist_libgw_report_system_la_SOURCES = gw-report-system.c nodist_libgw_report_system_la_SOURCES = gw-report-system.c
libgw_report_system_la_LIBADD = \ libgw_report_system_la_LIBADD = \
libgncmod-report-system.la \ libgncmod-report-system.la \
@ -82,6 +87,9 @@ noinst_DATA = .scm-links gw-report-system.h
EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA} EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA}
gw-report-system.scm gw-report-system.c gw-report-system.h: \ 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 .scm-links gw-report-system-spec.scm ${top_builddir}/config.status
FLAVOR=gnome $(GUILE) -c \ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ "(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)) \ (set! %load-path (cons \"${top_builddir}/src/gnome-utils\" %load-path)) \
(primitive-load \"./gw-report-system-spec.scm\") \ (primitive-load \"./gw-report-system-spec.scm\") \
(gw:generate-wrapset \"gw-report-system\")" (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 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 ${SCM_FILE_LINKS} gw-report-system.html

View File

@ -43,19 +43,23 @@ SCM_FILE_LINKS = ${gncscmmod_DATA}
endif endif
.scm-links: .scm-links:
rm -f gnucash report $(RM) -rf gnucash
$(LN_S) -f . gnucash mkdir -p gnucash
$(LN_S) -f ${srcdir} report mkdir -p gnucash/report
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif endif
( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf gnucash
noinst_DATA = .scm-links noinst_DATA = .scm-links
EXTRA_DIST = ${gncscmmod_DATA} EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}

View File

@ -45,16 +45,20 @@ SCM_FILE_LINKS = ${gncscmmod_DATA}
endif endif
.scm-links: .scm-links:
rm -f gnucash report $(RM) -rf gnucash
$(LN_S) -f . gnucash mkdir -p gnucash
$(LN_S) -f ${srcdir} report mkdir -p gnucash/report
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif endif
( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf gnucash
noinst_DATA = .scm-links noinst_DATA = .scm-links
uidir = $(GNC_UI_DIR) uidir = $(GNC_UI_DIR)
@ -63,5 +67,5 @@ dist_ui_DATA = \
EXTRA_DIST = ${gncscmmod_DATA} EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}

View File

@ -32,19 +32,23 @@ SCM_FILE_LINKS = \
endif endif
.scm-links: .scm-links:
rm -f gnucash report $(RM) -rf gnucash
$(LN_S) -f . gnucash mkdir -p gnucash
$(LN_S) -f ${srcdir} report mkdir -p gnucash/report
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \ for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \ $(LN_S) -f ${srcdir}/$$X . ; \
done done
endif endif
( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf gnucash
noinst_DATA = .scm-links noinst_DATA = .scm-links
EXTRA_DIST = ${gncscmmod_DATA} EXTRA_DIST = ${gncscmmod_DATA}
CLEANFILES = gnucash report .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}