"make clean" removes generated mkws.min.js

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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index a50c05f..15e96b6 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
-MKWS_JS_MIN=   mkws-complete.min.js
 JSMIN=         yui-compressor
 PZ2API_JS=     ../../../pazpar2/js/pz2.js
 PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/pazpar2
@@ -33,6 +32,7 @@ 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)
@@ -67,9 +67,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_JS_MIN}: ${MKWS_JS}
-       ${JSMIN} ${MKWS_JS} > ${MKWS_JS_MIN} > ${MKWS_JS_MIN}.new
-       mv -f ${MKWS_JS_MIN}.new ${MKWS_JS_MIN}
+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 $@
@@ -87,6 +89,7 @@ release: mkws.js mkws-complete.js mkws-complete.min.js
                echo "*** There is already a release $(VERSION)"; \
        else \
                cp -p mkws.js releases/mkws-$(VERSION).js; \
+               cp -p mkws.min.js releases/mkws-$(VERSION).min.js; \
                cp -p mkws-complete.js releases/mkws-complete-$(VERSION).js; \
                cp -p mkws-complete.min.js releases/mkws-complete-$(VERSION).min.js; \
                echo "Made release $(VERSION)"; \
@@ -123,7 +126,7 @@ distclean: clean
        rm -f *.orig *.bak *.rej
 
 clean:
-       rm -f ${MKWS_JS} ${MKWS_JS_MIN}
+       rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
        rm -f ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
        rm -f $(DOCS)