X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=a0d8165216fd28030eacd4896ea2c6567791c17e;hb=1508cee7e83ae7c4d74978330293c2bdfbe0d287;hp=bcb753d2ec1d485160726ad780d4b53f317b53d4;hpb=7722615c17cf1b36d1d2f25c6b60eadfc04653ee;p=mkws-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index bcb753d..a0d8165 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,18 +1,9 @@
-######################################################################
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
-#
-
-##############################
 # select a jquery version
-#
 #JQUERY_URL=	http://code.jquery.com/jquery-2.0.3.min.js
 JQUERY_URL=	http://code.jquery.com/jquery-1.10.0.min.js
 #JQUERY_URL=	http://code.jquery.com/jquery-1.9.1.min.js
-#JQUERY_URL=	http://code.jquery.com/jquery-1.8.3.min.js
-#JQUERY_URL=	http://code.jquery.com/jquery-1.7.2.min.js
 
 JQUERY_UI_URL=	http://code.jquery.com/ui/1.10.3/jquery-ui.js
-#JQUERY_UI_URL=	http://code.jquery.com/ui/1.8.0/jquery-ui.min.js
 JQUERY_JSON_URL= https://jquery-json.googlecode.com/files/jquery.json-2.4.js
 HANDLEBARS_URL=	http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js
 PP2_URL= 	http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD
@@ -26,17 +17,9 @@ HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
 PP2_FILE = pz2.js
 ##############################
 
-DOCS = README.html README.odt README.pdf \
-       whitepaper.html whitepaper.odt whitepaper.pdf
-
-# Default rule when "make" is invoked without a target
-**default**: ${MKWS_JS} mkws-js-min README.html whitepaper.html
-
-all: ${MKWS_JS} mkws-js-min $(DOCS)
+all: ${MKWS_JS} mkws-js-min
 
-docs: $(DOCS)
-
-mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
+mkws-js ${MKWS_JS}: Makefile mkws.js mkws-jquery.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
 	( set -e; \
 	  echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
 	  echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
@@ -49,6 +32,7 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLE
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
+	  cat  mkws-jquery.js; \
 	) > ${MKWS_JS}.new
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
@@ -61,8 +45,6 @@ mkws-js-min: mkws.min.js mkws-complete.min.js
 mkws-syntax-check:
 	yui-compressor mkws.js >/dev/null
 
-mkws-complete-syntax-check: mkws-js-min
-
 ${JQUERY_FILE}:
 	curl -sSf ${JQUERY_URL} -o $@.new
 	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
@@ -91,30 +73,6 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 		echo "Made release $(VERSION)"; \
 	fi
 
-# For a description of pandoc's markdown format, see:
-# http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
-
-# for older pandoc (<1.9) run first:
-# perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/whitepaper.markdown
-#
-%.html: %.markdown
-	rm -f $@
-	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
-	chmod ugo-w $@
-
-%.odt: %.markdown
-	rm -f $@
-	pandoc --standalone $< -o $@
-	chmod ugo-w $@
-
-# ### In order to compile the whitepaper, which has tables, to PDF,
-# you will need to install the Debian package
-#	texlive-latex-recommended
-%.pdf: %.markdown
-	rm -f $@
-	pandoc --standalone $< -o $@
-	chmod ugo-w $@
-
 ##############################
 # helper targets
 #
@@ -122,14 +80,11 @@ distclean: clean
 	rm -f *.orig *.bak *.rej
 
 clean:
-	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
+	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE} ${PP2_FILE}
 	rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
-	rm -f $(DOCS)
 
 help:
-	@echo "make [ help | docs | clean ]"
-	@echo "     [ mkws-js | mkws-js-min ]"
-	@echo "     [ mkws-syntax-check | mkws-complete-syntax-check ]"
+	@echo "make [ help | clean | mkws-js | mkws-js-min ]"
 	@echo ""
 	@echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
 	@echo ""