r14804 - gnucash/trunk/src/business - Last round of Makefile and symlink cleanup. Gnucash should build fine without symlinks now.

Christian Stimming cstim at cvs.gnucash.org
Wed Sep 6 05:35:31 EDT 2006 

Author: cstim
Date: 2006-09-06 05:35:30 -0400 (Wed, 06 Sep 2006)
New Revision: 14804
Trac: http://svn.gnucash.org/trac/changeset/14804

Modified:
   gnucash/trunk/src/business/business-core/Makefile.am
   gnucash/trunk/src/business/business-gnome/Makefile.am
   gnucash/trunk/src/business/business-reports/Makefile.am
   gnucash/trunk/src/business/business-utils/Makefile.am
   gnucash/trunk/src/business/dialog-tax-table/Makefile.am
Log:
Last round of Makefile and symlink cleanup. Gnucash should build fine without symlinks now.

Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am	2006-09-06 09:26:41 UTC (rev 14803)
+++ gnucash/trunk/src/business/business-core/Makefile.am	2006-09-06 09:35:30 UTC (rev 14804)
@@ -100,17 +100,25 @@
 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 @@
 	 (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}

Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am	2006-09-06 09:26:41 UTC (rev 14803)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am	2006-09-06 09:35:30 UTC (rev 14804)
@@ -123,17 +123,25 @@
 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 @@
 	 (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

Modified: gnucash/trunk/src/business/business-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-reports/Makefile.am	2006-09-06 09:26:41 UTC (rev 14803)
+++ gnucash/trunk/src/business/business-reports/Makefile.am	2006-09-06 09:35:30 UTC (rev 14804)
@@ -14,20 +14,24 @@
 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}

Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am	2006-09-06 09:26:41 UTC (rev 14803)
+++ gnucash/trunk/src/business/business-utils/Makefile.am	2006-09-06 09:35:30 UTC (rev 14804)
@@ -50,14 +50,18 @@
 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}

Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2006-09-06 09:26:41 UTC (rev 14803)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2006-09-06 09:35:30 UTC (rev 14804)
@@ -73,17 +73,25 @@
 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 @@
 	 (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

More information about the gnucash-changes mailing list