X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=2c7bb8085ae9405007d3f950c4cacc13ef08362b;hb=1912ded3ee0065a71ee0d16c1e5aaba0daef82a0;hp=d377c4cf69b94d510ed3296c2319cda0056d3527;hpb=b4acb7ae819563c3b75bbdabfaf2662fd24b06e4;p=jquery.git

diff --git a/Makefile b/Makefile
index d377c4c..2c7bb80 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,9 @@ VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: update_submodules jquery min lint
+all: update_submodules core
+
+core: jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -96,8 +98,16 @@ distclean: clean
 	@@rm -rf test/qunit src/sizzle
 
 # change pointers for submodules and update them to what is specified in jQuery
+# --merge  doesn't work when doing an initial clone, thus test if we have non-existing
+#  submodules, then do an real update
 update_submodules:
-	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
+	@@if [ -d .git ]; then \
+		if git submodule status | grep -q -E '^-'; then \
+			git submodule update --init --recursive; \
+		else \
+			git submodule update --init --recursive --merge; \
+		fi; \
+	fi;
 
 # update the submodules to the latest at the most logical branch
 pull_submodules:
@@ -107,4 +117,4 @@ pull_submodules:
 pull: pull_submodules
 	@@git pull ${REMOTE} ${BRANCH}
 
-.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull
+.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull core