X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=749d20559e309815cc30ad57f7abec717c988108;hb=3e6d3c8b9b9608c5d688379d11ea47fb53919735;hp=c9dcce32992d76cdba3d2002f11b62812d1f2b49;hpb=638909c660c1a11395a389f553c0c0f68a1bb8fd;p=mkws-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index c9dcce3..749d205 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,25 +1,25 @@
 HANDLEBARS_FILE = handlebars-v1.1.2.js
 JQUERY_FILE = jquery-1.10.0.min.js
 JQUERY_JSON_FILE = jquery.json-2.4.js
+PP2_FILE = pz2.js
 
 HANDLEBARS_URL = http://builds.handlebarsjs.com.s3.amazonaws.com/${HANDLEBARS_FILE}
 JQUERY_URL = http://code.jquery.com/${JQUERY_FILE}
 JQUERY_JSON_URL = https://jquery-json.googlecode.com/files/${JQUERY_JSON_FILE}
+PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD
 
 JQUERY_UI_URL =	http://code.jquery.com/ui/1.10.3/jquery-ui.js
-PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD
 VERSION = $(shell tr -d '\012' < VERSION)
 
 COMPONENTS = mkws-handlebars.js \
 	mkws-core.js mkws-team.js mkws-widgets.js mkws-widget-termlists.js \
-	mkws-widget-authname.js mkws-widget-log.js mkws-widget-record.js
-
-PP2_FILE = pz2.js
+	mkws-widget-authname.js mkws-widget-categories.js mkws-widget-log.js \
+	mkws-widget-record.js mkws-widget-builder.js
 
-INSTALLABLE = ${HANDLEBARS_FILE} \
-	${JQUERY_FILE} ${JQUERY_JSON_FILE} \
-	pz2.js mkws.js mkws-jquery.js mkws-complete.js \
-	mkws.min.js mkws-complete.min.js VERSION NEWS
+INSTALLABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
+	mkws.js mkws-jquery.js mkws-complete.js \
+	mkws.min.js mkws-complete.min.js \
+	VERSION NEWS
 INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
 
 **make-default**: ../tools/htdocs/mkws.js
@@ -34,7 +34,7 @@ uninstall:
 
 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}
+mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
 	( set -e; \
 	  echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
 	  echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
@@ -58,6 +58,10 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${JQUERY_FILE} ${JQUER
 mkws-syntax-check:
 	yui-compressor mkws.js >/dev/null
 
+${HANDLEBARS_FILE}:
+	curl -sSf ${HANDLEBARS_URL} -o $@.tmp
+	mv -f $@.tmp $@
+
 ${JQUERY_FILE}:
 	curl -sSf ${JQUERY_URL} -o $@.new
 	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
@@ -67,10 +71,6 @@ ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
 	mv -f $@.tmp $@
 
-${HANDLEBARS_FILE}:
-	curl -sSf ${HANDLEBARS_URL} -o $@.tmp
-	mv -f $@.tmp $@
-
 ${PP2_FILE}:
 	curl -sSf "${PP2_URL}" -o $@.tmp
 	mv -f $@.tmp $@
@@ -95,9 +95,6 @@ distclean: clean
 	rm -f *.orig *.bak *.rej
 
 clean:
-	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE} ${PP2_FILE}
+	rm -f ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
 	rm -f mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
 
-help:
-	@echo "make [ help | clean | mkws-js ]"
-	@echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"