X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile;h=ab04fc72dd8ec159bd77890a3dc8413d99c4de9a;hb=b99a8c62ed342809871bdad8ec8890809ee0b726;hp=4b4505fab6491a2a5eb3e1050c7da03d938b250b;hpb=bc7424475ae85ee91283b07a35100ee1ca7d0c84;p=mkws-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index 4b4505f..ab04fc7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,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 \
@@ -34,7 +34,7 @@ COMPONENTS = mkws-handlebars.js \
 
 DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
 RELEASABLE = mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
-AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) mkws-jquery.js NEWS VERSION
+AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION
 INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%)
 INSTALLED_RELEASABLE = $(RELEASABLE:%=$(DEST)/%)
 INSTALLED = $(AVAILABLE:%=$(DEST)/%)
@@ -79,19 +79,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,8 +106,8 @@ $(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
@@ -114,7 +120,7 @@ html-includes:
 	  perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src/$$_"></script>\n}'
 
 clean distclean:
-	rm -f ${INSTALLED}
+	rm -f ${INSTALLED} mkws-templates.js
 
 help:
 	@echo "make [ all | clean | release ]"