[dahdi-commits] kpfleming: linux-complete/trunk r4623 - /linux-complete/trunk/Makefile

[SVN commits to the DAHDI project]

Author: kpfleming
Date: Mon Jul 21 14:49:52 2008
New Revision: 4623

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4623
Log:
bring back descending for updates, as the submodules might need it

Modified:
    linux-complete/trunk/Makefile

Modified: linux-complete/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux-complete/trunk/Makefile?view=diff&rev=4623&r1=4622&r2=4623
==============================================================================
--- linux-complete/trunk/Makefile (original)
+++ linux-complete/trunk/Makefile Mon Jul 21 14:49:52 2008
@@ -28,16 +28,12 @@
 	$(MAKE) -C tools config
 
 update:
-update:
 	@if [ -d .svn ]; then \
 		echo "Updating from Subversion..." ; \
-		svn update | tee update.out; \
+		svn update --non-recursive .; \
 		rm -f .version; \
-		if [ `grep -c ^C update.out` -gt 0 ]; then \
-			echo ; echo "The following files have conflicts:" ; \
-			grep ^C update.out | cut -b4- ; \
-		fi ; \
-		rm -f update.out; \
+		$(MAKE) -C linux update; \
+		$(MAKE) -C tools update; \
 	else \
 		echo "Not under version control";  \
 	fi