X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=7ce2626b401e6e7b37008a5ed4c25b167d681c15;hb=789f134268b5fcd82592db69384aefb17e37ac63;hp=c413ca193491508352008a906d09ff46166d7194;hpb=ed761d190272865ee0b660faf335c450a248b7f5;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index c413ca1..7ce2626 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -24,7 +24,7 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
 	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
 
-**make-default**: mkws.js
+**make-default**: all
 
 all: mkws.min.js mkws-complete.min.js
 
@@ -43,12 +43,12 @@ mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FI
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
 	  cat  ${SRC}/mkws-jquery.js; \
-	) > mkws-complete.js.new
-	mv -f mkws-complete.js.new mkws-complete.js
+	) > mkws-complete.js.tmp
+	mv -f mkws-complete.js.tmp mkws-complete.js
 
 %.min.js: %.js
-	yui-compressor $? > $@.new
-	mv -f $@.new $@
+	yui-compressor $? > $@.tmp
+	mv -f $@.tmp $@
 
 mkws-syntax-check:
 	yui-compressor mkws.js >/dev/null
@@ -58,9 +58,9 @@ ${HANDLEBARS_FILE}:
 	mv -f $@.tmp $@
 
 ${JQUERY_FILE}:
-	curl -sSf ${JQUERY_URL} -o $@.new
-	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
-	rm -f $@.new
+	curl -sSf ${JQUERY_URL} -o $@.tmp
+	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@
+	rm -f $@.tmp
 
 ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
@@ -83,9 +83,14 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 
 mkws.js: $(COMPONENTS) Makefile
 	rm -f $@
-	cat ${COMPONENTS} > $@
+	cat ${COMPONENTS} > $@.tmp
+	mv -f $@.tmp $@
 	chmod 444 $@
 
+mkws-html-includes: 
+	echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \
+	  perl -n0e 'print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+
 distclean: clean
 	@echo "(No need for distclean, 'make clean' is fine)"