null+****@clear*****
null+****@clear*****
2011年 5月 25日 (水) 15:38:02 JST
Kouhei Sutou 2011-05-25 06:38:02 +0000 (Wed, 25 May 2011)
New Revision: 81705ccddc98c14cd50c44c7b458c1b3a37a92c0
Log:
[doc] add clean-html target.
Modified files:
Makefile.am
build/makefiles/sphinx.am
doc/Makefile.am
doc/locale/Makefile.am
Modified: Makefile.am (+1 -0)
===================================================================
--- Makefile.am 2011-05-25 06:20:04 +0000 (513929b)
+++ Makefile.am 2011-05-25 06:38:02 +0000 (9ca87f5)
@@ -84,6 +84,7 @@ update-document:
fi
rm -rf tmp-doc
mkdir tmp-doc
+ (cd doc && $(MAKE) clean-html)
(cd doc && $(MAKE) install docdir=$(abs_srcdir)/tmp-doc/install)
ruby $(srcdir)/tools/prepare-sphinx-html.rb tmp-doc/install tmp-doc/dist
rm -rf $(GROONGA_GITHUB_COM_PATH)/docs
Modified: build/makefiles/sphinx.am (+3 -1)
===================================================================
--- build/makefiles/sphinx.am 2011-05-25 06:20:04 +0000 (376a124)
+++ build/makefiles/sphinx.am 2011-05-25 06:38:02 +0000 (6c0f10b)
@@ -56,7 +56,7 @@ maintainer-clean-local:
.PHONY: help
.PHONY: man generate-man
-.PHONY: html generate-html
+.PHONY: html generate-html clean-html
.PHONY: pdf generate-pdf
.PHONY: dirhtml generate-dirhtml
.PHONY: pickle generate-pickle
@@ -107,6 +107,8 @@ html-build-stamp: $(document_source_files)
$(ALLSPHINXOPTS) \
html
@touch $@
+clean-html:
+ @rm -rf html-build-stamp $(DOCTREES_BASE)/html html
pdf: generate-pdf
generate-pdf: pdf-build-stamp
Modified: doc/Makefile.am (+2 -7)
===================================================================
--- doc/Makefile.am 2011-05-25 06:20:04 +0000 (1c54969)
+++ doc/Makefile.am 2011-05-25 06:38:02 +0000 (cc168c0)
@@ -8,14 +8,9 @@ include $(top_srcdir)/build/makefiles/sphinx-build.am
update-examples:
GROONGA=$(GROONGA) $(srcdir)/source/update_execution_example.py
-man:
+man pdf clean-html:
for dir in $(SUBDIRS); do \
- (cd $${dir} && $(MAKE) man); \
- done
-
-pdf:
- for dir in $(SUBDIRS); do \
- (cd $${dir} && $(MAKE) pdf); \
+ (cd $${dir} && $(MAKE) $@); \
done
EXTRA_DIST = \
Modified: doc/locale/Makefile.am (+2 -7)
===================================================================
--- doc/locale/Makefile.am 2011-05-25 06:20:04 +0000 (3d02aa6)
+++ doc/locale/Makefile.am 2011-05-25 06:38:02 +0000 (5c2ef70)
@@ -24,12 +24,7 @@ add:
a \ \ doc\/locale\/$(LOCALE)\/LC_MESSAGES\/Makefile" \
$(top_srcdir)/configure.ac
-man:
+man pdf clean-html:
for dir in $(SUBDIRS); do \
- (cd $${dir} && $(MAKE) man); \
- done
-
-pdf:
- for dir in $(SUBDIRS); do \
- (cd $${dir} && $(MAKE) pdf); \
+ (cd $${dir} && $(MAKE) $@); \
done