aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Fürstenberg <azatoth@gmail.com>2011-03-17 20:14:15 +0100
committerCarl Fürstenberg <azatoth@gmail.com>2011-03-17 20:21:32 +0100
commit4f9e78616ecd9ca403a25ee0e3dc71781484e553 (patch)
treec47fb28be178fbd06ba7c32a0eb305e8013b49a8
parent22738e0e4b988f8ce2cb341b137ba0fe4646d3f3 (diff)
downloadjquery-4f9e78616ecd9ca403a25ee0e3dc71781484e553.tar.gz
jquery-4f9e78616ecd9ca403a25ee0e3dc71781484e553.zip
Change makefile order to only update submodules on 'all' target
insterad of always update the submodules, now only "make all" will run that, thus an "make jquery" will not update them
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3223b8da4..9ef44cff1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,16 +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 --merge; fi
-
-jquery: init ${JQ}
+jquery: ${JQ}
${JQ}: ${MODULES} | ${DIST_DIR}
@@echo "Building" ${JQ}
@@ -98,6 +95,10 @@ 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)"