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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 6fe1b65..420bb49 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -19,6 +19,7 @@ COMPONENTS = ${SRC}/mkws-handlebars.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 \
@@ -36,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"; \
@@ -50,7 +51,6 @@ 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.tmp
 	mv -f mkws-complete.js.tmp mkws-complete.js
 
@@ -97,7 +97,7 @@ mkws.js: $(COMPONENTS) Makefile
 
 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}'
+	  perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
 
 distclean: clean
 	@echo "(No need for distclean, 'make clean' is fine)"