Hiroshi Ohkubo
null+****@clear*****
Fri Apr 22 15:30:38 JST 2016
Hiroshi Ohkubo 2016-04-22 15:30:38 +0900 (Fri, 22 Apr 2016) New Revision: 55c138060faf1a042d5d99d97fcb4fae53a98223 https://github.com/groonga/groonga/commit/55c138060faf1a042d5d99d97fcb4fae53a98223 Merged 7541af9: Merge pull request #532 from ohkubo/support-only-html Message: sphinx: support only HTML output Modified files: .gitignore build/makefiles/gettext.am build/makefiles/sphinx-build.am doc/Makefile.am doc/locale/Makefile.am Modified: .gitignore (+0 -10) =================================================================== --- .gitignore 2016-04-22 14:32:22 +0900 (626bc2e) +++ .gitignore 2016-04-22 15:30:38 +0900 (c09a4fa) @@ -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 Modified: build/makefiles/gettext.am (+0 -2) =================================================================== --- build/makefiles/gettext.am 2016-04-22 14:32:22 +0900 (9cea8ce) +++ build/makefiles/gettext.am 2016-04-22 15:30:38 +0900 (c6e57c7) @@ -59,8 +59,6 @@ build: endif html: build -man: build -pdf: build gettext: rm *.pot || true Modified: build/makefiles/sphinx-build.am (+1 -4) =================================================================== --- build/makefiles/sphinx-build.am 2016-04-22 14:32:22 +0900 (57e4a75) +++ build/makefiles/sphinx-build.am 2016-04-22 15:30:38 +0900 (047823b) @@ -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)" \ Modified: doc/Makefile.am (+1 -1) =================================================================== --- doc/Makefile.am 2016-04-22 14:32:22 +0900 (6a9f5cb) +++ doc/Makefile.am 2016-04-22 15:30:38 +0900 (459d135) @@ -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 Modified: doc/locale/Makefile.am (+1 -1) =================================================================== --- doc/locale/Makefile.am 2016-04-22 14:32:22 +0900 (eed4598) +++ doc/locale/Makefile.am 2016-04-22 15:30:38 +0900 (4afc8c6) @@ -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 -------------- next part -------------- HTML����������������������������...ダウンロード
