Skip to content
Browse files
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
  • Loading branch information
azatoth committed Mar 17, 2011
1 parent 22738e0 commit 4f9e786
Showing 1 changed file with 6 additions and 5 deletions.
@@ -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."

@@mkdir -p ${DIST_DIR}

@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi

jquery: init ${JQ}
jquery: ${JQ}

@@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
@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi

# update the submodules to the latest at the most logical branch
@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"

0 comments on commit 4f9e786

Please sign in to comment.