From: Mike Taylor <mike@indexdata.com>
Date: Thu, 19 Dec 2013 13:22:36 +0000 (+0000)
Subject: Generalise rule to make %.min.js
X-Git-Tag: 0.9.1~15
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=96de89a268f4b199bdd42ed912f043dcff56c7ff;p=mkws-moved-to-github.git

Generalise rule to make %.min.js
mkws-js-min now depends on both mkws.min.js and mkws-complete.min.js
---

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index a902133..0276b27 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -66,9 +66,11 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 	) > ${MKWS_JS}.new
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
-mkws-js-min mkws-complete.min.js: ${MKWS_JS}
-	${JSMIN} ${MKWS_JS} > mkws-complete.min.js.new
-	mv -f mkws-complete.min.js.new mkws-complete.min.js
+mkws-js-min: mkws.min.js mkws-complete.min.js
+
+%.min.js: %.js
+	${JSMIN} $? > $@.new
+	mv -f $@.new $@
 
 ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@