From a33b08d7409ba4568917791ecaee847dd4b84b05 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Tue, 25 Mar 2014 15:51:12 +0000 Subject: [PATCH] Move documentation-related rules out to new ../doc/Makefile --- src/Makefile | 48 +++--------------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/src/Makefile b/src/Makefile index bcb753d..a2834f8 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,15 +17,7 @@ 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) - -docs: $(DOCS) +all: ${MKWS_JS} mkws-js-min mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE} ( set -e; \ @@ -91,30 +74,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 '/^$//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,12 +81,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 "make [ help | clean ]" @echo " [ mkws-js | mkws-js-min ]" @echo " [ mkws-syntax-check | mkws-complete-syntax-check ]" @echo "" -- 1.7.10.4