[Bf-blender-cvs] [e5adeed] master: Makefile: add 'update' convenience target

[Campbell Barton]

Commit: e5adeed40be1603be912938e340415eb4bf55585
Author: Campbell Barton
Date:   Mon Sep 15 14:04:30 2014 +1000
Branches: master
https://developer.blender.org/rBe5adeed40be1603be912938e340415eb4bf55585

Makefile: add 'update' convenience target

===================================================================

M	GNUmakefile

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 6e3e3cd..91d3aa1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -193,6 +193,7 @@ help:
 	@echo "Utilities (not associated with building blender)"
 	@echo "  * icons    - updates PNG icons from SVG files."
 	@echo "  * tbz      - create a compressed svn export 'blender_archive.tar.bz2'"
+	@echo "  * update   - updates git and all submodules
 	@echo ""
 	@echo "Documentation Targets (not associated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
@@ -370,6 +371,13 @@ icons:
 	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
 	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
+update:
+	if [ -d "../lib" ]; then \
+		svn update ../lib/* ; \
+	fi
+	git pull --rebase
+	git submodule foreach git pull --rebase origin master
+
 
 # -----------------------------------------------------------------------------
 # Documentation