X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=doc%2FMakefile.am;h=76a1be179546cd8ccd117a26b948f938cc8dffcd;hb=0cc824e02bc2c69986bec8c9dd9ff53f07a0cd3d;hp=cdfe72883fe04a7534d080af1d25cdba33ab6981;hpb=0ae7eb1f7101c29d5c088bf40aa26abc50c57913;p=yazpp-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index cdfe728..76a1be1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.12 2004-03-30 22:26:16 adam Exp $
+## $Id: Makefile.am,v 1.16 2006-03-29 13:14:14 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUPPORTFILES = \
@@ -8,35 +8,22 @@ SUPPORTFILES = \
  tkl.xsl.in \
  xml.dcl
 XMLFILES = \
+ introduction.xml \
  installation.xml \
  zoom.xml \
- proxy.xml \
  api.xml \
- yaz-proxy-ref.xml \
- yaz-proxy-man.sgml \
  license.xml \
- yaz++.xml.in
+ yazpp.xml.in
  
-TOP=yaz++.xml
-MANFILES=yaz-proxy.8
+TOP=yazpp.xml
+MANFILES=
 HTMLFILES = \
  api.html \
  implementations.html \
  installation.html \
+ introduction.html \
  license.html \
- other-optimizations.html \
- otherinfo-encoding.html \
- proxy-config-file.html \
- proxy-keepalive.html \
- proxy-target.html \
- proxy-usage.html \
- proxy.html \
- query-cache.html \
- query-validation.html \
- record-cache.html \
- record-validation.html \
  windows.html \
- yaz-proxy.html \
  yazpp.html \
  zoom-connection.html \
  zoom-exception.html \
@@ -45,7 +32,7 @@ HTMLFILES = \
  zoom-resultset.html \
  zoom.html
 
-doc_DATA = $(HTMLFILES) yaz++.pdf yaz.css
+doc_DATA = $(HTMLFILES) yazpp.pdf id.png yaz.css
 
 man_MANS = $(MANFILES)
 
@@ -54,17 +41,15 @@ EXTRA_DIST = $(SUPPORTFILES) $(XMLFILES) $(doc_DATA) $(man_MANS)
 $(HTMLFILES): $(XMLFILES)
 	jade -E14 -D $(srcdir) -d yazhtml.dsl -t sgml $(srcdir)/xml.dcl $(TOP)
 
-yaz-proxy.8: yaz-proxy-man.sgml yaz-proxy-ref.xml
-	docbook2man $(srcdir)/yaz-proxy-man.sgml
-
 yazpp.php: $(XMLFILES)
 	jade -E14 -D $(srcdir) -d yazphp.dsl -t sgml $(srcdir)/xml.dcl $(TOP)
 
-yaz++.pdf: $(XMLFILES)
+yazpp.pdf: $(XMLFILES)
+	if test ! -f id.png ; then ln -s $(srcdir)/id.png .; fi
 	jade -E14 -D $(srcdir) -d yazprint.dsl -t tex $(srcdir)/xml.dcl $(TOP)
-	pdfjadetex yaz++.tex
-	pdfjadetex yaz++.tex
-	pdfjadetex yaz++.tex
+	pdfjadetex yazpp.tex >pdfjadetex.log 2>&1
+	pdfjadetex yazpp.tex >pdfjadetex.log 2>&1
+	pdfjadetex yazpp.tex >pdfjadetex.log 2>&1
 
 index.tkl: $(XMLFILES) tkl.xsl
 	xsltproc tkl.xsl $(TOP)
@@ -72,3 +57,18 @@ index.tkl: $(XMLFILES) tkl.xsl
 clean-data-hook:
 	rm -f [0-9]* *.bak
 
+dist-hook:
+	for f in $(srcdir)/*.html; do \
+		found=0; \
+		b=`basename $$f`; \
+		for h in $(HTMLFILES); do \
+			if test "$$h" = "$$b"; then \
+				found=1; \
+			fi \
+		done; \
+		if test "$$found" = "0"; then \
+			echo "$$h not found in HTMLFILES"; \
+			exit 1; \
+		fi \
+	done
+