From 3b37b7798cab326907f2e48223371ff1737b94fb Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Mon, 29 Sep 2014 14:27:24 +0000 Subject: [PATCH 1/1] fix dependencies for generated file ../../src/mkws-templates.js, MKWS-273 --- tools/htdocs/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile index b561e92..71da3ee 100644 --- a/tools/htdocs/Makefile +++ b/tools/htdocs/Makefile @@ -35,7 +35,7 @@ COMPONENTS = ${SRC}/mkws-handlebars.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-templates.js + mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js **make-default**: all @@ -93,14 +93,15 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js echo "Made release $(VERSION)"; \ fi -mkws.js: mkws-templates.js $(COMPONENTS) Makefile +mkws.js: $(COMPONENTS) Makefile 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 +${SRC}/mkws-templates.js: ${SRC}/*.templates/*.handlebars + ${HANDLEBARS} -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f $@.tmp + mv -f $@.tmp $@ mkws-html-includes: echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \ -- 1.7.10.4