X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=9ef44cff14af15ef30743069ecfd7bd1f74bd464;hb=4f9e78616ecd9ca403a25ee0e3dc71781484e553;hp=7b67f7aff78c97b74e78ed0b18ec171d4ce64a5a;hpb=cd2ca7b5918b3cedfed497ac7d86bfd2c5f92a8b;p=jquery.git

diff --git a/Makefile b/Makefile
index 7b67f7a..9ef44cf 100644
--- a/Makefile
+++ b/Makefile
@@ -42,17 +42,13 @@ VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: jquery min lint
+all: update_submodules jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-init:
-	@@if [ -d .git ]; then git submodule update --init --recursive; fi
-
-jquery: init ${JQ}
-jq: init ${JQ}
+jquery: ${JQ}
 
 ${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}
@@ -99,9 +95,16 @@ distclean: clean
 	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
+# change pointers for submodules and update them to what is specified in jQuery
+update_submodules:
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
+
 # update the submodules to the latest at the most logical branch
 pull_submodules:
 	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
 	@@git submodule summary
 
+pull: pull_submodules
+	@@git pull ${REMOTE} ${BRANCH}
+
 .PHONY: all jquery lint min init jq clean