r14764 - gnucash/trunk/src/report - Next round of Makefile symlink cleanup.

Christian Stimming cstim at cvs.gnucash.org
Tue Aug 29 04:05:35 EDT 2006


Author: cstim
Date: 2006-08-29 04:05:33 -0400 (Tue, 29 Aug 2006)
New Revision: 14764
Trac: http://svn.gnucash.org/trac/changeset/14764

Modified:
   gnucash/trunk/src/report/locale-specific/us/Makefile.am
   gnucash/trunk/src/report/report-gnome/Makefile.am
   gnucash/trunk/src/report/report-system/Makefile.am
   gnucash/trunk/src/report/standard-reports/Makefile.am
   gnucash/trunk/src/report/stylesheets/Makefile.am
   gnucash/trunk/src/report/utility-reports/Makefile.am
Log:
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.

Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -31,23 +31,27 @@
 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}

Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -88,18 +88,26 @@
 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 @@
 	  (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

Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/report-system/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -57,17 +57,22 @@
 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 @@
 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 @@
 	  (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

Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -43,19 +43,23 @@
 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/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -45,16 +45,20 @@
 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 @@
 
 EXTRA_DIST = ${gncscmmod_DATA}
 
-CLEANFILES = gnucash report .scm-links
+CLEANFILES = .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS}

Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am	2006-08-29 07:48:09 UTC (rev 14763)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am	2006-08-29 08:05:33 UTC (rev 14764)
@@ -32,19 +32,23 @@
 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}



More information about the gnucash-changes mailing list