mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
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@14747 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
1fa413f54d
commit
23c8cff5a8
@ -124,17 +124,25 @@ SCM_FILE_LINKS += \
|
||||
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-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
|
||||
FLAVOR=gnome $(GUILE) -c \
|
||||
"(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)) \
|
||||
(primitive-load \"./gw-app-utils-spec.scm\") \
|
||||
(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
|
||||
CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} gnucash g-wrapped \
|
||||
CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} \
|
||||
.scm-links gw-app-utils.html
|
||||
|
@ -286,17 +286,25 @@ SCM_FILE_LINKS += \
|
||||
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-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
|
||||
FLAVOR=gnome $(GUILE) -c \
|
||||
"(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)) \
|
||||
(primitive-load \"./gw-gnome-utils-spec.scm\") \
|
||||
(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
|
||||
CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links \
|
||||
CLEANFILES = $(BUILT_SOURCES) .scm-links \
|
||||
${SCM_FILE_LINKS} gw-gnome-utils.html
|
||||
|
||||
#
|
||||
|
@ -144,9 +144,8 @@ SCM_FILE_LINKS = gw-gnc-spec.scm
|
||||
endif
|
||||
|
||||
.scm-links:
|
||||
rm -f gnucash g-wrapped
|
||||
$(LN_S) -f . gnucash
|
||||
$(LN_S) -f . g-wrapped
|
||||
$(RM) -rf g-wrapped
|
||||
mkdir -p g-wrapped
|
||||
if GNUCASH_SEPARATE_BUILDDIR
|
||||
for X in ${SCM_FILE_LINKS} ; do \
|
||||
$(LN_S) -f ${srcdir}/$$X . ; \
|
||||
@ -154,7 +153,15 @@ if GNUCASH_SEPARATE_BUILDDIR
|
||||
endif
|
||||
touch .scm-links
|
||||
|
||||
clean-local:
|
||||
$(RM) -rf g-wrapped
|
||||
|
||||
.INTERMEDIATE: gwrap-files
|
||||
|
||||
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
|
||||
FLAVOR=gnome $(GUILE) -c \
|
||||
"(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)) \
|
||||
(primitive-load \"./gw-gnc-spec.scm\") \
|
||||
(gw:generate-wrapset \"gw-gnc\")"
|
||||
touch $@
|
||||
( cd g-wrapped; $(LN_S) ../gw-*.scm . )
|
||||
|
||||
BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
|
||||
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
|
||||
|
@ -82,10 +82,8 @@ SCM_FILE_LINKS = gw-register-core-spec.scm
|
||||
endif
|
||||
|
||||
.scm-links:
|
||||
rm -f gnucash g-wrapped
|
||||
$(LN_S) -f . gnucash
|
||||
$(LN_S) -f . g-wrapped
|
||||
$(LN_S) -f . register
|
||||
$(RM) -rf g-wrapped
|
||||
mkdir -p g-wrapped
|
||||
if GNUCASH_SEPARATE_BUILDDIR
|
||||
for X in ${SCM_FILE_LINKS} ; do \
|
||||
$(LN_S) -f ${srcdir}/$$X . ; \
|
||||
@ -93,7 +91,15 @@ if GNUCASH_SEPARATE_BUILDDIR
|
||||
endif
|
||||
touch .scm-links
|
||||
|
||||
clean-local:
|
||||
$(RM) -rf g-wrapped
|
||||
|
||||
.INTERMEDIATE: gwrap-files
|
||||
|
||||
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
|
||||
FLAVOR=gnome $(GUILE) -c \
|
||||
"(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)) \
|
||||
(primitive-load \"./gw-register-core-spec.scm\") \
|
||||
(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
|
||||
CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped register .scm-links \
|
||||
CLEANFILES = $(BUILT_SOURCES) .scm-links \
|
||||
${SCM_FILE_LINKS} gw-register-core.html
|
||||
|
@ -30,15 +30,19 @@ SCM_FILE_LINKS = \
|
||||
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 $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
|
||||
touch .scm-links
|
||||
|
||||
clean-local:
|
||||
$(RM) -rf gnucash
|
||||
|
||||
SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}
|
||||
|
||||
EXTRA_DIST = \
|
||||
@ -58,6 +62,6 @@ build-config.scm: ${srcdir}/build-config.scm.in Makefile
|
||||
-e 's#@-GNC_HELPDIR-@#${GNC_HELPDIR}#'
|
||||
mv $@.tmp $@
|
||||
|
||||
CLEANFILES = gnucash .scm-links
|
||||
CLEANFILES = .scm-links
|
||||
DISTCLEANFILES = ${SCM_FILE_LINKS}
|
||||
MAINTAINERCLEANFILES = build-config.scm
|
||||
|
@ -28,21 +28,25 @@ SCM_FILE_LINKS = \
|
||||
endif
|
||||
|
||||
.scm-links:
|
||||
rm -f gnucash tax
|
||||
$(LN_S) -f . gnucash
|
||||
$(LN_S) -f . tax
|
||||
$(RM) -rf gnucash
|
||||
mkdir -p gnucash
|
||||
mkdir -p gnucash/tax
|
||||
if GNUCASH_SEPARATE_BUILDDIR
|
||||
for X in ${SCM_FILE_LINKS} ; do \
|
||||
$(LN_S) -f ${srcdir}/$$X . ; \
|
||||
done
|
||||
endif
|
||||
( cd gnucash/tax; 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} \
|
||||
${gncscm_DATA}
|
||||
|
||||
CLEANFILES = gnucash tax .scm-links
|
||||
CLEANFILES = .scm-links
|
||||
DISTCLEANFILES = ${SCM_FILE_LINKS}
|
||||
|
Loading…
Reference in New Issue
Block a user