New file no-service-proxy.html

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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 82d4e7e..420bb49 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -16,31 +16,28 @@ 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
 
-INSTALLABLE = ${SRC}/mkws-jquery.js VERSION NEWS $(GENERATED)
-
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
-
-**make-default**: mkws.js
-
-install: $(INSTALLED)
-
-uninstall:
-       rm -f $(INSTALLED)
-
-../tools/htdocs/%: %
-       rm -f $@ && cp -p $? $@ && chmod 444 $@
+**make-default**: all
 
 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"; \
@@ -54,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
@@ -70,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
@@ -95,11 +91,16 @@ 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 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+
 distclean: clean
-       rm -f *.orig *.bak *.rej
+       @echo "(No need for distclean, 'make clean' is fine)"
 
 clean:
        rm -f ${GENERATED}