"make all" depends on mkws-js-min

[mkws-moved-to-github.git] / tools / htdocs / Makefile

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 1f56b29..72653b6 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -20,7 +20,6 @@ HANDLEBARS_URL=       http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.
 VERSION = $(shell tr -d '\012' < VERSION)
 
 MKWS_JS=       mkws-complete.js
-JSMIN=         yui-compressor
 PZ2API_JS=     ../../../pazpar2/js/pz2.js
 PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/pazpar2
 
@@ -32,9 +31,10 @@ HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
 
+# Default rule when "make" is invoked without a target
 **default**: ${MKWS_JS} README.html whitepaper.html
 
-all: ${MKWS_JS} $(DOCS)
+all: ${MKWS_JS} $(DOCS) mkws-js-min
 
 docs: $(DOCS)
 
@@ -69,7 +69,7 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 mkws-js-min: mkws.min.js mkws-complete.min.js
 
 %.min.js: %.js
-       ${JSMIN} $? > $@.new
+       yui-compressor $? > $@.new
        mv -f $@.new $@
 
 ${JQUERY_JSON_FILE}:
@@ -125,7 +125,7 @@ distclean: clean
        rm -f *.orig *.bak *.rej
 
 clean:
-       rm -f ${MKWS_JS} mkws-complete.min.js
+       rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
        rm -f ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
        rm -f $(DOCS)