summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-01-27 16:56:27 +0100
committerDaniel Mack <daniel@zonque.org>2015-01-27 16:57:43 +0100
commit8d5ea76219ec33ee01d379103d9be8c9c2ad7ce1 (patch)
tree2fe3154a04f3f39a854b78caf7ad2944986f4e2c
parent33480053544c99892d63819979b4a520f72e8b55 (diff)
downloadkdbus-bus-8d5ea76219ec33ee01d379103d9be8c9c2ad7ce1.tar.gz
kdbus-bus-8d5ea76219ec33ee01d379103d9be8c9c2ad7ce1.tar.bz2
kdbus-bus-8d5ea76219ec33ee01d379103d9be8c9c2ad7ce1.zip
doc: enable html output
Type 'make htmldoc' to get doc/*.html Signed-off-by: Daniel Mack <daniel@zonque.org>
-rw-r--r--.gitignore4
-rw-r--r--Makefile8
-rw-r--r--doc/Makefile8
3 files changed, 16 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index c2ccf2113bf..741a86c7a6d 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 419acd94b45..605cb88db1b 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 3aac6d3d34f..3b70469e9d8 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.*