[svn-commits] kpfleming: linux-complete/trunk r4622 - /linux-complete/trunk/Makefile

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Jul 21 14:48:01 2008
New Revision: 4622

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4622
Log:
use a top-level update instead of descending

Modified:
    linux-complete/trunk/Makefile

Modified: linux-complete/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux-complete/trunk/Makefile?view=diff&rev=4622&r1=4621&r2=4622
==============================================================================
--- linux-complete/trunk/Makefile (original)
+++ linux-complete/trunk/Makefile Mon Jul 21 14:48:01 2008
@@ -28,7 +28,18 @@
 	$(MAKE) -C tools config
 
 update:
-	$(MAKE) -C linux update
-	$(MAKE) -C tools update
+update:
+	@if [ -d .svn ]; then \
+		echo "Updating from Subversion..." ; \
+		svn update | tee update.out; \
+		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; \
+	else \
+		echo "Not under version control";  \
+	fi
 
 .PHONY: all clean distclean dist-clean install config update