IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Next round of Makefile symlink cleanup.

Browse Source 
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@14747 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-08-28 15:20:29 +00:00
parent 1fa413f54d
commit 23c8cff5a8
6 changed files with 70 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app-utils/Makefile.am
View File

@ -124,17 +124,25 @@ SCM_FILE_LINKS += \
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
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; 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-app-utils.scm gw-app-utils.c gw-app-utils.h: \ gw-app-utils.scm gw-app-utils.c gw-app-utils.h: \
gwrap-files
gwrap-files: \
.scm-links gw-app-utils-spec.scm ${top_builddir}/config.status .scm-links gw-app-utils-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)) \
@ -142,7 +150,9 @@ gw-app-utils.scm gw-app-utils.c gw-app-utils.h: \
(set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \ (set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
(primitive-load \"./gw-app-utils-spec.scm\") \ (primitive-load \"./gw-app-utils-spec.scm\") \
(gw:generate-wrapset \"gw-app-utils\")" (gw:generate-wrapset \"gw-app-utils\")"
touch $@
( cd g-wrapped; $(LN_S) ../gw-*.scm . )
BUILT_SOURCES = gw-app-utils.scm gw-app-utils.c gw-app-utils.h BUILT_SOURCES = gw-app-utils.scm gw-app-utils.c gw-app-utils.h
CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} gnucash g-wrapped \ CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} \
.scm-links gw-app-utils.html .scm-links gw-app-utils.html

18
src/gnome-utils/Makefile.am
View File

@ -286,17 +286,25 @@ SCM_FILE_LINKS += \
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
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; 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-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \ gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \
gwrap-files
gwrap-files: \
.scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status Makefile .scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status Makefile
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)) \
@ -305,9 +313,11 @@ gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \
(set! %load-path (cons \"${top_builddir}/src/app-utils\" %load-path)) \ (set! %load-path (cons \"${top_builddir}/src/app-utils\" %load-path)) \
(primitive-load \"./gw-gnome-utils-spec.scm\") \ (primitive-load \"./gw-gnome-utils-spec.scm\") \
(gw:generate-wrapset \"gw-gnome-utils\")" (gw:generate-wrapset \"gw-gnome-utils\")"
touch $@
( cd g-wrapped; $(LN_S) ../gw-*.scm . )
BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h
CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links \ CLEANFILES = $(BUILT_SOURCES) .scm-links \
${SCM_FILE_LINKS} gw-gnome-utils.html ${SCM_FILE_LINKS} gw-gnome-utils.html
# #

18
src/gnome/Makefile.am
View File

@ -144,9 +144,8 @@ SCM_FILE_LINKS = gw-gnc-spec.scm
endif endif
.scm-links: .scm-links:
rm -f gnucash g-wrapped $(RM) -rf g-wrapped
$(LN_S) -f . gnucash mkdir -p g-wrapped
$(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 . ; \
@ -154,7 +153,15 @@ if GNUCASH_SEPARATE_BUILDDIR
endif endif
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf g-wrapped
.INTERMEDIATE: gwrap-files
gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \ gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
gwrap-files
gwrap-files: \
gw-gnc-spec.scm .scm-links ${top_builddir}/config.status Makefile gw-gnc-spec.scm .scm-links ${top_builddir}/config.status Makefile
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)) \
@ -164,6 +171,9 @@ gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
(set! %load-path (cons \"../report/report-gnome\" %load-path)) \ (set! %load-path (cons \"../report/report-gnome\" %load-path)) \
(primitive-load \"./gw-gnc-spec.scm\") \ (primitive-load \"./gw-gnc-spec.scm\") \
(gw:generate-wrapset \"gw-gnc\")" (gw:generate-wrapset \"gw-gnc\")"
touch $@
( cd g-wrapped; $(LN_S) ../gw-*.scm . )
BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
CLEANFILES = $(BUILT_SOURCES) gnucash.desktop \ CLEANFILES = $(BUILT_SOURCES) gnucash.desktop \
gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} gw-gnc.html g-wrapped .scm-links ${SCM_FILE_LINKS} gw-gnc.html

18
src/register/register-core/Makefile.am
View File

@ -82,10 +82,8 @@ SCM_FILE_LINKS = gw-register-core-spec.scm
endif endif
.scm-links: .scm-links:
rm -f gnucash g-wrapped $(RM) -rf g-wrapped
$(LN_S) -f . gnucash mkdir -p g-wrapped
$(LN_S) -f . g-wrapped
$(LN_S) -f . register
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 . ; \
@ -93,7 +91,15 @@ if GNUCASH_SEPARATE_BUILDDIR
endif endif
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf g-wrapped
.INTERMEDIATE: gwrap-files
gw-register-core.scm gw-register-core.c gw-register-core.h: \ gw-register-core.scm gw-register-core.c gw-register-core.h: \
gwrap-files
gwrap-files: \
.scm-links gw-register-core-spec.scm ${top_builddir}/config.status .scm-links gw-register-core-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)) \
@ -101,7 +107,9 @@ gw-register-core.scm gw-register-core.c gw-register-core.h: \
(set! %load-path (cons \"${top_srcdir}/src/engine\" %load-path)) \ (set! %load-path (cons \"${top_srcdir}/src/engine\" %load-path)) \
(primitive-load \"./gw-register-core-spec.scm\") \ (primitive-load \"./gw-register-core-spec.scm\") \
(gw:generate-wrapset \"gw-register-core\")" (gw:generate-wrapset \"gw-register-core\")"
touch $@
( cd g-wrapped; $(LN_S) ../gw-*.scm . )
BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped register .scm-links \ CLEANFILES = $(BUILT_SOURCES) .scm-links \
${SCM_FILE_LINKS} gw-register-core.html ${SCM_FILE_LINKS} gw-register-core.html

10
src/scm/Makefile.am
View File

@ -30,15 +30,19 @@ SCM_FILE_LINKS = \
endif endif
.scm-links: .scm-links:
rm -f gnucash $(RM) -rf gnucash
$(LN_S) -f ${srcdir} gnucash mkdir -p gnucash
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; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
touch .scm-links touch .scm-links
clean-local:
$(RM) -rf gnucash
SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA} SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}
EXTRA_DIST = \ EXTRA_DIST = \
@ -58,6 +62,6 @@ build-config.scm: ${srcdir}/build-config.scm.in Makefile
-e 's#@-GNC_HELPDIR-@#${GNC_HELPDIR}#' -e 's#@-GNC_HELPDIR-@#${GNC_HELPDIR}#'
mv $@.tmp $@ mv $@.tmp $@
CLEANFILES = gnucash .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = build-config.scm MAINTAINERCLEANFILES = build-config.scm

12
src/tax/us/Makefile.am
View File

@ -28,21 +28,25 @@ SCM_FILE_LINKS = \
endif endif
.scm-links: .scm-links:
rm -f gnucash tax $(RM) -rf gnucash
$(LN_S) -f . gnucash mkdir -p gnucash
$(LN_S) -f . tax mkdir -p gnucash/tax
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/tax; 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 = \ EXTRA_DIST = \
${gncscmmod_DATA} \ ${gncscmmod_DATA} \
${gncscm_DATA} ${gncscm_DATA}
CLEANFILES = gnucash tax .scm-links CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS} DISTCLEANFILES = ${SCM_FILE_LINKS}