updating phony rules

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b67f7a..d377c4c 100644 (file)
--- 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
 
-.PHONY: all jquery lint min init jq clean
+pull: pull_submodules
+       @@git pull ${REMOTE} ${BRANCH}
+
+.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull