From 8d5ea76219ec33ee01d379103d9be8c9c2ad7ce1 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Tue, 27 Jan 2015 16:56:27 +0100
Subject: [PATCH] doc: enable html output

Type 'make htmldoc' to get doc/*.html

Signed-off-by: Daniel Mack <daniel@zonque.org>
---
 .gitignore   | 4 ++--
 Makefile     | 8 ++++++--
 doc/Makefile | 8 ++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2ccf21..741a86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,5 @@ Module.symvers
 tags
 tools/kdbus-monitor
 test/kdbus-test
-doc/html
-doc/man
+doc/*.html
+doc/*.7
diff --git a/Makefile b/Makefile
index 419acd9..605cb88 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ KERNELVER		?= $(shell uname -r)
 KERNELDIR 		?= /lib/modules/$(KERNELVER)/build
 PWD			:= $(shell pwd)
 
-all: module tools test
+all: module tools test doc
 
 tools::
 	$(MAKE) -C tools KERNELDIR=$(realpath $(KERNELDIR)) KBUILD_MODNAME=kdbus$(EXT)
@@ -40,6 +40,7 @@ clean:
 	rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
 	rm -f Module.markers Module.symvers modules.order
 	rm -rf .tmp_versions Modules.symvers $(hostprogs-y)
+	$(MAKE) -C doc clean
 	$(MAKE) -C test clean
 
 check:
@@ -48,7 +49,10 @@ check:
 mandoc:	
 	$(MAKE) -C doc mandoc
 
-doc:	mandoc
+htmldoc:	
+	$(MAKE) -C doc htmldoc
+
+doc:	mandoc htmldoc
 
 kerneldoc_check:
 	$(KERNELDIR)/scripts/kernel-doc *.c kdbus.h >/dev/null | grep "^Warning"
diff --git a/doc/Makefile b/doc/Makefile
index 3aac6d3..3b70469 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,9 +12,17 @@ docs=	\
 	kdbus.pool.xml
 
 manpages=$(docs:.xml=.7)
+htmlfiles=$(docs:.xml=.html)
 
 %.7: %.xml
 	xmlto man -m stylesheet.xsl -o . $<
 
+%.html: %.xml
+	xmlto html-nochunks -m stylesheet.xsl -o . $<
+
 mandoc: $(manpages)
 
+htmldoc: $(htmlfiles)
+
+clean::
+	rm -rf *.7 *.html *.proc manpages.*
-- 
2.34.1