X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2FMakefile.am;h=b2e32662b56bb2e1d2c083d65230a864f4f2b62f;hp=2c7d3a800294f9da9844095ea9730d3e5c826b03;hb=d96575f586fecf1d1eed9ecd7a172c9ccb261ffc;hpb=aee1a87eeda33b4b049e9fc0a0a826b9c14018cc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c7d3a8..b2e3266 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,25 +1,27 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2008 Index Data
+## Copyright (C) 1995-2013 Index Data
 
 SUBDIRS = common
 
 XMLFILES=bookinfo.xml introduction.xml installation.xml \
  indexdata.xml \
- asn.xml tools.xml odr.xml comstack.xml frontend.xml license.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 \
+ yaz.xml soap.xml gfs-virtual.xml gfs-synopsis.xml \
  std-oid-table.xml manref.xml
 
 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
 
@@ -32,13 +34,13 @@ 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
+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,14 +70,16 @@ yaz-log.7: yaz-log-man.xml
 yaz-icu.1: yaz-icu-man.xml
 	$(MAN_COMPILE) $(srcdir)/yaz-icu-man.xml
 
+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)
 	rm -f *.html
 	$(HTML_COMPILE) $(srcdir)/yaz.xml
 
-index.tkl: $(XMLFILES)
-	rm -f *.tkl
-	$(TKL_COMPILE) $(srcdir)/yaz.xml
-
 yaz.pdf: $(XMLFILES)
 	$(PDF_COMPILE) $(srcdir)/yaz.xml
 
@@ -105,12 +109,12 @@ dist-hook:
 	done
 
 doc-clean:
-	rm -f *.html *.[0-9] *.pdf *.tkl
+	rm -f manref.xml *.html *.[0-9] *.pdf
 
 install-data-hook:
 	if test -f index.html; then d=.; else d="$(srcdir)"; fi; \
 	for p in $$d/*.html; do \
-		$(docDATA_INSTALL) $$p $(DESTDIR)$(docdir); \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(docdir); \
 	done
 
 uninstall-hook: