1 files changed, 34 insertions, 37 deletions

diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index 02a433299..e7e9289c4 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -1,39 +1,32 @@
 include $(top_srcdir)/misc/Makefile.common
 
-hackersguide_sgml = hackersguide.sgml \
-		    intro.sgml \
-		    library.sgml \
-		    overview.sgml \
-		    internals.sgml \
-		    stream.sgml \
-		    output.sgml
-hackersguide_fig = architecture.fig \
-		   library.fig \
-		   overlays.fig \
-		   post_frame.fig
+hackersguide_docbook = hackersguide.docbook \
+		    intro.docbook \
+		    library.docbook \
+		    overview.docbook \
+		    internals.docbook \
+		    stream.docbook \
+		    output.docbook
+hackersguide_svg = architecture.svg \
+		   library.svg \
+		   overlays.svg \
+		   post_frame.svg
 
+hackersguidedir = $(htmldir)/hackersguide
 hackersguide_DATA = hackersguide.html \
             architecture.png library.png overlays.png post_frame.png
 
-EXTRA_DIST = README $(hackersguide_sgml) $(hackersguide_fig) \
+EXTRA_DIST = README $(hackersguide_docbook) $(hackersguide_svg) \
 	 $(hackersguide_DATA)
 
-hackersguidedir = $(htmldir)/hackersguide
+DISTCLEANFILES = $(hackersguide_DATA)
 
-docs: $(hackersguide_DATA)
-
-distclean-local: clean-docs
+SUFFIXES = .png .fig
 
-docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml))
-	if test "$(srcdir)" != "."  -a "$(srcdir)" != "`pwd`"; then \
-	  for file in $(hackersguide_sgml) ; do \
-	    test -f ./$$file -a ./$$file -nt $(srcdir)/$$file || cp $(srcdir)/$$file .; \
-	  done ; \
-	fi
+docs: $(hackersguide_DATA)
 
 clean-docs:
 	rm -f $(hackersguide_DATA)
-	test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml) *.fig
 
 dist-hook:
 	@if test x"$(distcheck_lax)" = x ; then \
@@ -42,36 +35,40 @@ dist-hook:
 	  $(MAKE) docs ; \
 	fi
 
-if HAVE_SGMLTOOLS
-hackersguide.html: $(hackersguide_sgml)
-	@$(MAKE) docs-prepare
-	$(SGMLTOOLS) -b onehtml hackersguide.sgml;
+distclean-local: clean-docs
+
+if HAVE_XMLTO
+hackersguide.html: $(hackersguide_docbook)
+	xmlto xhtml-nochunks "$(srcdir)/hackersguide.docbook"
 else
-hackersguide.html: $(hackersguide_sgml)
-	@$(MAKE) docs-prepare
+hackersguide.html: $(hackersguide_docbook)
 	if test x"$(fail_if_missing)" = x"yes"; then \
-	  echo "Please install sgmltools-lite."; \
+	  echo "Please install xmlto."; \
 	  exit 1; \
 	fi
 	if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
-	  touch $(notdir $^); \
+	  touch $^; \
 	fi
 endif
+	$(SED) -i -e '/<img [^>]*alt=/! s/<img /<img alt="" /g' $@ # we want valid XHTML 1.1
 
-if HAVE_FIG2DEV
-%.png: %.fig
-	$(FIG2DEV) -L png -S 4 $< $@;
+if HAVE_RSVG
+.svg.png:
+	rsvg -f png $^ $@
+if HAVE_OPTIPNG
+	optipng $@
+endif
 else
-%.png: %.fig
+.svg.png:
 	if test x"$(fail_if_missing)" = x"yes"; then \
-	  echo "Please install fig2dev."; \
+	  echo "Please install rsvg."; \
 	  exit 1; \
 	fi
 	if test x"$(fail_if_missing)" != x"yes"; then \
 	  touch $@; \
 	  sleep 1; \
-	  touch $(notdir $^); \
+	  touch $^; \
 	fi
 endif