Documentation: add top level 'make help' output for Sphinx

While there's slight overlap with the DocBook help now, this can stay
intact when the DocBook help goes away.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index e0c7e1e0590be85c2ab4bade64eb7e9c09e2d220..496d4295ec38e5a7b9c0d6d1927ac2be009193fd 100644 (file)
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -218,7 +218,7 @@ silent_gen_xml = :
 ###
 # Help targets as used by the top-level makefile
 dochelp:
-       @echo  ' Linux kernel internal documentation in different formats:'
+       @echo  ' Linux kernel internal documentation in different formats (DocBook):'
        @echo  '  htmldocs        - HTML'
        @echo  '  pdfdocs         - PDF'
        @echo  '  psdocs          - Postscript'
@@ -227,7 +227,7 @@ dochelp:
        @echo  '  installmandocs  - install man pages generated by mandocs'
        @echo  '  cleandocs       - clean all generated DocBook files'
        @echo
-       @echo  'make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
+       @echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
        @echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'
 
 

diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index addf32309bc356b8c14bfb6da87ae2a0f0a2c713..810c11f0d37f486cb35fb65133c70616a005b035 100644 (file)
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -60,4 +60,12 @@ installmandocs:
 cleandocs:
        $(Q)rm -rf $(BUILDDIR)
 
+dochelp:
+       @echo  ' Linux kernel internal documentation in different formats (Sphinx):'
+       @echo  '  htmldocs        - HTML'
+       @echo  '  pdfdocs         - PDF'
+       @echo  '  epubdocs        - EPUB'
+       @echo  '  xmldocs         - XML'
+       @echo  '  cleandocs       - clean all generated files'
+
 endif # HAVE_SPHINX

diff --git a/Makefile b/Makefile
index 8908a51b895a3a6d8199ba22199761d2e8e39d10..f7f393c4088627b6e4c129b3db68ae1928d4479f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1364,6 +1364,8 @@ help:
        @$(MAKE) $(build)=$(package-dir) help
        @echo  ''
        @echo  'Documentation targets:'
+       @$(MAKE) -f $(srctree)/Documentation/Makefile.sphinx dochelp
+       @echo  ''
        @$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
        @echo  ''
        @echo  'Architecture specific targets ($(SRCARCH)):'