X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2FMakefile.am;h=07f12e6f64edb81b3d76e53a81c78a5b67fcd5ca;hp=f9db45d465fd9da0aa705255516293c8db3b8e6a;hb=HEAD;hpb=88d3bedf772316f87e1996f655ccf8d1e2589755

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f9db45d..07f12e6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,27 +1,27 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2010 Index Data
+## Copyright (C) Index Data
 
 SUBDIRS = common
 
-XMLFILES=bookinfo.xml introduction.xml installation.xml \
- indexdata.xml \
- asn.xml tools.xml odr.xml comstack.xml server.xml license.xml \
- future.xml zoom.xml credits.xml gfs-options.xml \
- yaz.xml yaz-client-commands.xml soap.xml gfs-virtual.xml gfs-synopsis.xml \
- std-oid-table.xml manref.xml
+XMLFILES = book.xml \
+ gfs-options.xml gfs-virtual.xml gfs-synopsis.xml \
+ std-oid-table.xml  bib1-diag-table.xml srw-diag-table.xml \
+ manref.xml local.ent
 
 HTMLFILES = index.html
 
 MANFILES=yaz-client.1 yaz-ztest.8 \
-	yaz-config.8 yaz.7 zoomsh.1 yaz-asncomp.1 \
+	yaz-config.1 yaz.7 zoomsh.1 yaz-asncomp.1 \
 	yaz-marcdump.1 yaz-iconv.1 yaz-log.7 \
-	yaz-illclient.1 yaz-icu.1 bib1-attr.7
+	yaz-illclient.1 yaz-icu.1 yaz-url.1 bib1-attr.7 \
+	yaz-json-parse.1
 REFFILES=yaz-client-man.xml yaz-ztest-man.xml yaz-config-man.xml \
 	yaz-man.xml zoomsh-man.xml yaz-asncomp-man.xml \
 	yaz-marcdump-man.xml yaz-iconv-man.xml yaz-log-man.xml \
-	yaz-illclient-man.xml yaz-icu-man.xml bib1-attr-man.xml
+	yaz-illclient-man.xml yaz-icu-man.xml yaz-url-man.xml \
+	bib1-attr-man.xml yaz-json-parse-man.xml
 
-SUPPORTFILES=entities.ent apilayer.obj local.ent.in
+SUPPORTFILES=entities.ent apilayer.obj
 
 doc_DATA = $(HTMLFILES) apilayer.png 
 man_MANS = $(MANFILES)
@@ -32,13 +32,19 @@ EXTRA_DIST = $(XMLFILES) $(SUPPORTFILES) $(man_MANS) $(REFFILES) \
 std-oid-table.xml: $(srcdir)/../src/oid.csv
 	$(TCLSH) $(srcdir)/../src/oidtoc.tcl $(srcdir) $(srcdir)/../src/oid.csv std-oid-table.xml
 
-yaz-client.1: $(srcdir)/yaz-client-man.xml $(srcdir)/yaz-client-commands.xml
+bib1-diag-table.xml: $(srcdir)/../src/bib1.csv
+	$(TCLSH) $(srcdir)/../src/csvtodiag.tcl $(srcdir)/../src/bib1.csv bib1-diag-table.xml bib1-diag-table
+
+srw-diag-table.xml: $(srcdir)/../src/srw.csv
+	$(TCLSH) $(srcdir)/../src/csvtodiag.tcl $(srcdir)/../src/srw.csv srw-diag-table.xml srw-diag-table
+
+yaz-client.1: $(srcdir)/yaz-client-man.xml
 	$(MAN_COMPILE) $(srcdir)/yaz-client-man.xml
 
 yaz-ztest.8: yaz-ztest-man.xml gfs-options.xml gfs-synopsis.xml gfs-virtual.xml
 	$(MAN_COMPILE) $(srcdir)/yaz-ztest-man.xml
 
-yaz-config.8: yaz-config-man.xml
+yaz-config.1: yaz-config-man.xml
 	$(MAN_COMPILE) $(srcdir)/yaz-config-man.xml
 
 yaz.7: yaz-man.xml
@@ -68,23 +74,31 @@ yaz-log.7: yaz-log-man.xml
 yaz-icu.1: yaz-icu-man.xml
 	$(MAN_COMPILE) $(srcdir)/yaz-icu-man.xml
 
-$(HTMLFILES): $(XMLFILES)
+yaz-url.1: yaz-url-man.xml
+	$(MAN_COMPILE) $(srcdir)/yaz-url-man.xml
+
+yaz-json-parse.1: yaz-json-parse-man.xml
+	$(MAN_COMPILE) $(srcdir)/yaz-json-parse-man.xml
+
+$(HTMLFILES): $(XMLFILES) book.xml
 	rm -f *.html
-	$(HTML_COMPILE) $(srcdir)/yaz.xml
+	$(HTML_COMPILE) $(srcdir)/book.xml
+
+$(MANFILES): local.ent
 
-yaz.pdf: $(XMLFILES)
-	$(PDF_COMPILE) $(srcdir)/yaz.xml
+yaz.pdf: $(XMLFILES) book.xml
+	$(PDF_COMPILE) $(srcdir)/book.xml && mv book.pdf yaz.pdf
 
 
 yazj.pdf:
-	jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(srcdir)/yaz.xml
+	jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(srcdir)/book.xml
 	rm -f yazj.pdf
-	cp yaz.tex yazj.tex
+	cp book.tex yazj.tex
 	pdfjadetex yazj.tex
 	pdfjadetex yazj.tex >/dev/null
 	pdfjadetex yazj.tex >/dev/null
 
-manref.xml: $(REFFILES) $(srcdir)/common/stripref.xsl
+manref.xml: $(REFFILES) $(srcdir)/common/stripref.xsl local.ent
 	rm -f manref.xml
 	for i in $(REFFILES); do \
 		xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >>manref.xml; \