Merge branch 'master' into templateallthemarkup

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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 388a4b8..02d64f8 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -17,12 +17,13 @@ VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
        ${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.js \
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
        ${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.js \

+       ${SRC}/mkws-templates.js \

        ${SRC}/mkws-widget.js ${SRC}/mkws-widget-main.js ${SRC}/mkws-widget-termlists.js \
        ${SRC}/mkws-widget-authname.js ${SRC}/mkws-widget-categories.js ${SRC}/mkws-widget-log.js \
        ${SRC}/mkws-widget-record.js ${SRC}/mkws-widget-reference.js ${SRC}/mkws-widget-builder.js
 
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
        ${SRC}/mkws-widget.js ${SRC}/mkws-widget-main.js ${SRC}/mkws-widget-termlists.js \
        ${SRC}/mkws-widget-authname.js ${SRC}/mkws-widget-categories.js ${SRC}/mkws-widget-log.js \
        ${SRC}/mkws-widget-record.js ${SRC}/mkws-widget-reference.js ${SRC}/mkws-widget-builder.js
 
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \

-       mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+       mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js mkws-templates.js

 
 **make-default**: all
 
 
 **make-default**: all
 

@@ -81,12 +82,15 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
                echo "Made release $(VERSION)"; \
        fi
 
                echo "Made release $(VERSION)"; \
        fi
 

-mkws.js: $(COMPONENTS) Makefile
+mkws.js: mkws-templates.js $(COMPONENTS) Makefile

        rm -f $@
        cat ${COMPONENTS} > $@.tmp
        mv -f $@.tmp $@
        chmod 444 $@
 
        rm -f $@
        cat ${COMPONENTS} > $@.tmp
        mv -f $@.tmp $@
        chmod 444 $@
 

+mkws-templates.js:
+       handlebars -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js
+

 distclean: clean
        @echo "(No need for distclean, 'make clean' is fine)"
 
 distclean: clean
        @echo "(No need for distclean, 'make clean' is fine)"