Merge branch 'dev'

CoeusCC · Oct 14, 2011 · b290deb · b290deb
2 parents ef9a252 + 49da72d
commit b290deb
Show file tree

Hide file tree

Showing 15 changed files with 400 additions and 162 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = git://github.com/recurser/jquery-i18n.git
 [submodule "libs/strophejs"]
 	path = libs/strophejs
-	url = git@github.com:amiadogroup/strophejs.git
+	url = git://github.com/amiadogroup/strophejs.git
 [submodule "libs/strophejs-plugins"]
 	path = libs/strophejs-plugins
 	url = git://github.com/metajack/strophejs-plugins.git

diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ CANDY_LIBS_FILES = $(LIBS_DIR)/strophejs/strophe.js $(LIBS_DIR)/strophejs-plugin
 CANDY_FILES_BUNDLE = $(CANDY_FILES:.js=.bundle)
 CANDY_LIBS_FILES_BUNDLE = $(CANDY_LIBS_FILES:.js=.libs-bundle)
 
-all: bundle min libs libs-min
+all: bundle min
 
 bundle: clean-bundle $(CANDY_FILES_BUNDLE)
 
@@ -47,7 +47,9 @@ else
 	@@echo "** Please set YUI_COMPRESSOR to the path to the jar file."
 endif
 
-libs: clean-libs $(CANDY_LIBS_FILES_BUNDLE)
+libs: libs-bundle libs-min
+
+libs-bundle: clean-libs $(CANDY_LIBS_FILES_BUNDLE)
 
 %.libs-bundle: %.js
 	@@echo -n "Bundling" $< "..."