X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=420bb498bc36df4e1749dd5b0fd8200f26aab07d;hp=7aedddbe8373706bebd041265319d32efe922143;hb=088fcd4edd66fe043fd04c69c9071596f831a114;hpb=8e7482cf04a9c47aa071e48a5d5a0ea8a35023f6

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 7aedddb..420bb49 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -16,10 +16,19 @@ JQUERY_UI_URL =	http://code.jquery.com/ui/1.10.3/jquery-ui.js
 VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
-	${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.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
+	${SRC}/mkws-core.js \
+	${SRC}/mkws-team.js \
+	${SRC}/mkws-filter.js \
+	${SRC}/mkws-popup.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} \
 	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
@@ -28,7 +37,7 @@ GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
 
 all: mkws.min.js mkws-complete.min.js
 
-mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
+mkws-js mkws-complete.js: Makefile mkws.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
 	( set -e; \
 	  echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
 	  echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
@@ -42,13 +51,12 @@ mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FI
 	  cat ${HANDLEBARS_FILE}; \
 	  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 +66,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
@@ -87,6 +95,10 @@ mkws.js: $(COMPONENTS) Makefile
 	mv -f $@.tmp $@
 	chmod 444 $@
 
+mkws-html-includes: 
+	echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \
+	  perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+
 distclean: clean
 	@echo "(No need for distclean, 'make clean' is fine)"