[Spread-cvs] commit: r244 - trunk

[jonathan at spread.org]

Author: jonathan
Date: 2005-07-15 10:51:21 -0400 (Fri, 15 Jul 2005)
New Revision: 244

Modified:
   trunk/Makefile.in
   trunk/configure
   trunk/configure.in
Log:
Update Makefiles and configure script to build John's stdutil package that was merged and
to set the spread version number correctly.


Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2005-07-15 14:30:16 UTC (rev 243)
+++ trunk/Makefile.in	2005-07-15 14:51:21 UTC (rev 244)
@@ -1,4 +1,4 @@
-SUBDIRS=daemon docs examples
+SUBDIRS=stdutil daemon docs examples
 
 all: $(SUBDIRS) 
 	for dir in $(SUBDIRS); do \
@@ -13,10 +13,12 @@
 	rm -f config.cache config.log core
 	rm -rf autom4te.cache
 
-distclean: clean
+distclean: 
 	for dir in $(SUBDIRS); do \
 		( $(MAKE) -C $$dir distclean); \
 	done
+	rm -f config.cache config.log core
+	rm -rf autom4te.cache
 	rm -f Makefile config.h config.status *~
 
 mrproper: distclean

Modified: trunk/configure
===================================================================
--- trunk/configure	2005-07-15 14:30:16 UTC (rev 243)
+++ trunk/configure	2005-07-15 14:51:21 UTC (rev 244)
@@ -8677,7 +8677,7 @@
 
 fi
 
-for i in `grep "SP_....._VERSION" ${srcdir}/spread_params.h | sed -e 's/#define//g' -e 's/[ 	]//g' -e 's/VERSION/VERSION=/g;'`
+for i in `grep "SP_....._VERSION" ${srcdir}/daemon/spread_params.h | sed -e 's/#define//g' -e 's/[ 	]//g' -e 's/VERSION/VERSION=/g;'`
 do
   eval $i
 done

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-07-15 14:30:16 UTC (rev 243)
+++ trunk/configure.in	2005-07-15 14:51:21 UTC (rev 244)
@@ -576,7 +576,7 @@
 	AC_DEFINE(HAVE_SYS_NERR)
 fi
 
-for i in `grep "SP_....._VERSION" ${srcdir}/spread_params.h | sed -e 's/#define//g' -e 's/[ 	]//g' -e 's/VERSION/VERSION=/g;'`
+for i in `grep "SP_....._VERSION" ${srcdir}/daemon/spread_params.h | sed -e 's/#define//g' -e 's/[ 	]//g' -e 's/VERSION/VERSION=/g;'`
 do
   eval $i
 done