diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-15 07:33:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-15 07:33:47 -0300 |
| commit | 425efba23509e18e39d0056799004f2005b66b15 (patch) | |
| tree | 5974ef02240a16194c9db3a93427991c56a9b30c /Documentation/DocBook | |
| parent | e6e9c9b238e49e4973391078952b34d3bde3df99 (diff) | |
| parent | 547218864afb2745d9d137f005f3380ef96b26ab (diff) | |
| download | op-kernel-dev-425efba23509e18e39d0056799004f2005b66b15.zip op-kernel-dev-425efba23509e18e39d0056799004f2005b66b15.tar.gz | |
Merge branch 'docs-next' of git://git.lwn.net/linux into devel/docs-next
* 'docs-next' of git://git.lwn.net/linux:
doc-rst: add an option to ignore DocBooks when generating docs
workqueue: Fix a typo in workqueue.txt
Doc: ocfs: Fix typo in filesystems/ocfs2-online-filecheck.txt
Documentation/sphinx: skip build if user requested specific DOCBOOKS
Documentation: add cleanmediadocs to the documentation targets
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 496d429..01bab50 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -6,6 +6,8 @@ # To add a new book the only step required is to add the book to the # list of DOCBOOKS. +ifeq ($(IGNORE_DOCBOOKS),) + DOCBOOKS := z8530book.xml device-drivers.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ writing_usb_driver.xml networking.xml \ @@ -215,6 +217,20 @@ silent_gen_xml = : -e "s/>/\\>/g"; \ echo "</programlisting>") > $@ +else + +# Needed, due to cleanmediadocs +include Documentation/DocBook/media/Makefile + +htmldocs: +pdfdocs: +psdocs: +xmldocs: +installmandocs: + +endif # IGNORE_DOCBOOKS + + ### # Help targets as used by the top-level makefile dochelp: @@ -229,6 +245,9 @@ dochelp: @echo @echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml' @echo ' valid values for DOCBOOKS are: $(DOCBOOKS)' + @echo + @echo " make IGNORE_DOCBOOKS=1 [target] Don't generate docs from Docbook" + @echo ' This is useful to generate only the ReST docs (Sphinx)' ### |
