Skip to content
Permalink
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 4f9e78616ecd9ca403a25ee0e3dc71781484e553
Showing with 6 additions and 5 deletions.
  1. +6 −5 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)"

0 comments on commit 4f9e786

Please sign in to comment.
You can’t perform that action at this time.