Part of MKWS-336.

[mkws-moved-to-github.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 120bab6..8d8b4c1 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,6 @@ PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};
 
 VERSION = $(shell tr -d '\012' < VERSION)
 HANDLEBARS = ../test/node_modules/.bin/handlebars
-YUI_COMPRESSOR = $(shell which yui-compressor ../test/bin/yui-compressor | head -1)
 
 COMPONENTS = mkws-handlebars.js \
        mkws-core.js \
@@ -22,7 +21,7 @@ COMPONENTS = mkws-handlebars.js \
        mkws-filter.js \
        mkws-widget.js \
        mkws-widget-main.js \
-       mkws-widget-termlists.js \
+       mkws-widget-facets.js \
        mkws-widget-authname.js \
        mkws-widget-categories.js \
        mkws-widget-log.js \
@@ -59,7 +58,7 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
        mv -f $@.tmp $@
 
 %.min.js: %.js
-       ${YUI_COMPRESSOR} $? > $@.tmp
+       yui-compressor $? > $@.tmp
        mv -f $@.tmp $@
 
 $(DEST)/${HANDLEBARS_FILE}:
@@ -79,19 +78,25 @@ $(DEST)/${PP2_FILE}:
        curl -sSf "${PP2_URL}" -o $@.tmp
        mv -f $@.tmp $@
 
-$(DEST)/%: %
+$(DEST)/NEWS: NEWS
        rm -f $@
        cp $? $@
        chmod 444 $@
 
-release: $(RELEASABLE)
-       @if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
+$(DEST)/VERSION: VERSION
+       rm -f $@
+       cp $? $@
+       chmod 444 $@
+
+release: $(INSTALLED_RELEASABLE)
+       if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
                echo "*** There is already a release $(VERSION)"; \
        else \
                cp -p $(DEST)/mkws.js ${DEST}/releases/mkws-$(VERSION).js; \
                cp -p $(DEST)/mkws.min.js ${DEST}/releases/mkws-$(VERSION).min.js; \
                cp -p $(DEST)/mkws-complete.js ${DEST}/releases/mkws-complete-$(VERSION).js; \
                cp -p $(DEST)/mkws-complete.min.js ${DEST}/releases/mkws-complete-$(VERSION).min.js; \
+               cp -p $(DEST)/mkws.css ${DEST}/releases/mkws-$(VERSION).css; \
                echo "Made release $(VERSION)"; \
        fi
 
@@ -100,13 +105,13 @@ $(DEST)/mkws.js: $(COMPONENTS) Makefile
        mv -f $@.tmp $@
        chmod 444 $@
 
-mkws-templates.js: *.templates/*.handlebars
-       ${HANDLEBARS} -n mkws.defaultTemplates *.templates/*.handlebars -f $@.tmp
+mkws-templates.js: templates/*.handlebars
+       ${HANDLEBARS} -n mkws.defaultTemplates templates/*.handlebars -f $@.tmp
        mv -f $@.tmp $@
 
 # Checks that the JavaScript can be parsed
 syntax-check: $(DEST)/mkws.js
-       ${YUI_COMPRESSOR} $(DEST)/mkws.js >/dev/null
+       yui-compressor $(DEST)/mkws.js >/dev/null
 
 # Emits a list of <script> elements to include in HTML applications
 html-includes: