X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=de56c71dfc2e2f9bc049ef389cd5278a8ffc7e89;hb=6475389c1c1875fcdd9057427fd61b1ea9ec05bf;hp=a2834f8bc34ee1bdca0f39fde7f5f3c693978c8e;hpb=a33b08d7409ba4568917791ecaee847dd4b84b05;p=mkws-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index a2834f8..de56c71 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,11 +15,14 @@ JQUERY_FILE := $(shell basename ${JQUERY_URL})
 JQUERY_JSON_FILE := $(shell basename ${JQUERY_JSON_URL})
 HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
 PP2_FILE = pz2.js
-##############################
 
-all: ${MKWS_JS} mkws-js-min
+INSTALLABLE = handlebars-v1.1.2.js jquery-1.10.0.min.js \
+	jquery.json-2.4.js mkws-complete.js mkws-complete.min.js \
+	mkws.min.js pz2.js
 
-mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
+all: mkws.min.js mkws-complete.min.js
+
+mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
 	( set -e; \
 	  echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
 	  echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
@@ -32,10 +35,9 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLE
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
-	) > ${MKWS_JS}.new
-	mv -f ${MKWS_JS}.new ${MKWS_JS}
-
-mkws-js-min: mkws.min.js mkws-complete.min.js
+	  cat  mkws-jquery.js; \
+	) > mkws-complete.js.new
+	mv -f mkws-complete.js.new mkws-complete.js
 
 %.min.js: %.js
 	yui-compressor $? > $@.new
@@ -44,8 +46,6 @@ mkws-js-min: mkws.min.js mkws-complete.min.js
 mkws-syntax-check:
 	yui-compressor mkws.js >/dev/null
 
-mkws-complete-syntax-check: mkws-js-min
-
 ${JQUERY_FILE}:
 	curl -sSf ${JQUERY_URL} -o $@.new
 	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
@@ -74,21 +74,13 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 		echo "Made release $(VERSION)"; \
 	fi
 
-##############################
-# helper targets
-#
 distclean: clean
 	rm -f *.orig *.bak *.rej
 
 clean:
 	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE} ${PP2_FILE}
-	rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
+	rm -f mkws.min.js mkws-complete.js mkws-complete.min.js
 
 help:
-	@echo "make [ help | clean ]"
-	@echo "     [ mkws-js | mkws-js-min ]"
-	@echo "     [ mkws-syntax-check | mkws-complete-syntax-check ]"
-	@echo ""
+	@echo "make [ help | clean | mkws-js ]"
 	@echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
-	@echo ""
-	@echo "Please check ./README file too!"