doc: enable html output

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

Signed-off-by: Daniel Mack <daniel@zonque.org>

diff --git a/.gitignore b/.gitignore
index c2ccf2113bf126f829a70cb3bb743712e8920878..741a86c7a6db465df653950a61a43f56af06bf7d 100644 (file)
--- 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 419acd94b45cc6d6c1cc92b728b153d356d1ec18..605cb88db1bd584c5d110532434810466463cd31 100644 (file)
--- 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 3aac6d3d34fb1f0a5895b776b2caff8fb5452b73..3b70469e9d864adb3fc799051418865bf7398da7 100644 (file)
--- 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.*