X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=d377c4cf69b94d510ed3296c2319cda0056d3527;hb=b4acb7ae819563c3b75bbdabfaf2662fd24b06e4;hp=84816a19e1cfcd7b6bb79cc078881b7a1bea6384;hpb=bd4468886d97edfb53342e1a10acb300d081ed27;p=jquery.git diff --git a/Makefile b/Makefile index 84816a1..d377c4c 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,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)" @@ -107,4 +107,4 @@ pull_submodules: pull: pull_submodules @@git pull ${REMOTE} ${BRANCH} -.PHONY: all jquery lint min init jq clean +.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull