Merge pull request #532 from ohkubo/support-only-html

sphinx: support only HTML output

Patch by Hiroshi Ohkubo. Thanks!!!

.gitignore

@@ -74,16 +74,6 @@ CMakeFiles
 /doc/locale/*/*-stamp
 /doc/locale/*/doctrees/
 /doc/locale/*/html/
-/doc/locale/*/dirhtml/
-/doc/locale/*/htmlhelp/
-/doc/locale/*/json/
-/doc/locale/*/latex/
-/doc/locale/*/qthelp/
-/doc/locale/*/rdoc/
-/doc/locale/*/man/
-/doc/locale/*/pickle/
-/doc/locale/*/textile/
-/doc/locale/*/pdf/
 /doc/locale/*/LC_MESSAGES/*.mo
 /doc/locale/*/LC_MESSAGES/*.pot
 /doc/locale/*/LC_MESSAGES/*.edit

build/makefiles/gettext.am

@@ -59,8 +59,6 @@ build:
 endif
 
 html: build
-man: build
-pdf: build
 
 gettext:
 	rm *.pot || true

build/makefiles/sphinx-build.am

@@ -2,13 +2,10 @@
 DOCTREES_BASE = doctrees
 
 SPHINXOPTS    =
-PAPER         =
 
 # Internal variables.
 SOURCE_DIR      = $(abs_top_srcdir)/doc/source
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(PAPEROPT_$(PAPER)) -E $(SPHINXOPTS) $(SOURCE_DIR)
+ALLSPHINXOPTS   = -E $(SPHINXOPTS) $(SOURCE_DIR)
 
 SPHINX_BUILD_COMMAND =						\
 	DOCUMENT_VERSION="$(DOCUMENT_VERSION)"			\

doc/Makefile.am

@@ -24,7 +24,7 @@ update-files: $(BUILT_SOURCES)
 	cd locale/en && $(MAKE) clean html
 	cd $(srcdir); ./update-files.sh > files.am
 
-man pdf clean-html update-po:
+clean-html update-po:
 	for dir in $(SUBDIRS); do		\
 	  (cd $${dir} && $(MAKE) $@);		\
 	done

doc/locale/Makefile.am

@@ -24,7 +24,7 @@ add:
               a \ \ doc\/locale\/$(LOCALE)\/LC_MESSAGES\/Makefile"	\
 	  $(top_srcdir)/configure.ac
 
-man pdf clean-html init update-po:
+clean-html init update-po:
 	for dir in $(SUBDIRS); do		\
 	  (cd $${dir} && $(MAKE) $@);		\
 	done