X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=docs%2Finclude.am;h=b2df2533f3d1b27f84fa7bbb0e1d7d0527097345;hb=ed60da56bcd4780cd616e76dea9a9886acc2ae95;hp=12eb61df768f90973ab99722702f8a45bef48b7d;hpb=5b2a7d8c63479f52d2fc82e120082b9f24357c9f;p=awesomized%2Flibmemcached

diff --git a/docs/include.am b/docs/include.am
index 12eb61df..b2df2533 100644
--- a/docs/include.am
+++ b/docs/include.am
@@ -16,125 +16,8 @@ ALLSPHINXOPTS   = -d $(SPHINX_BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOP
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
-man_MANS+= docs/man/hashkit_clone.3
-man_MANS+= docs/man/hashkit_crc32.3
-man_MANS+= docs/man/hashkit_create.3
-man_MANS+= docs/man/hashkit_fnv1_32.3
-man_MANS+= docs/man/hashkit_fnv1_64.3
-man_MANS+= docs/man/hashkit_fnv1a_32.3
-man_MANS+= docs/man/hashkit_fnv1a_64.3
-man_MANS+= docs/man/hashkit_free.3
-man_MANS+= docs/man/hashkit_functions.3
-man_MANS+= docs/man/hashkit_hsieh.3
-man_MANS+= docs/man/hashkit_is_allocated.3
-man_MANS+= docs/man/hashkit_jenkins.3
-man_MANS+= docs/man/hashkit_md5.3
-man_MANS+= docs/man/hashkit_murmur.3
-man_MANS+= docs/man/hashkit_value.3
-man_MANS+= docs/man/libhashkit.3
-man_MANS+= docs/man/libmemcached.3
-man_MANS+= docs/man/libmemcached_examples.3
-man_MANS+= docs/man/libmemcachedutil.3
-man_MANS+= docs/man/memaslap.1
-man_MANS+= docs/man/memcached_add.3
-man_MANS+= docs/man/memcached_add_by_key.3
-man_MANS+= docs/man/memcached_analyze.3
-man_MANS+= docs/man/memcached_append.3
-man_MANS+= docs/man/memcached_append_by_key.3
-man_MANS+= docs/man/memcached_behavior_get.3
-man_MANS+= docs/man/memcached_behavior_set.3
-man_MANS+= docs/man/memcached_callback_get.3
-man_MANS+= docs/man/memcached_callback_set.3
-man_MANS+= docs/man/memcached_cas.3
-man_MANS+= docs/man/memcached_cas_by_key.3
-man_MANS+= docs/man/memcached_clone.3
-man_MANS+= docs/man/memcached_create.3
-man_MANS+= docs/man/memcached_decrement.3
-man_MANS+= docs/man/memcached_decrement_with_initial.3
-man_MANS+= docs/man/memcached_delete.3
-man_MANS+= docs/man/memcached_delete_by_key.3
-man_MANS+= docs/man/libmemcached_check_configuration.3
-man_MANS+= docs/man/libmemcached_configuration.3
-man_MANS+= docs/man/memcached.3
-man_MANS+= docs/man/memcached_destroy_sasl_auth_data.3
-man_MANS+= docs/man/memcached_dump.3
-man_MANS+= docs/man/memcached_exist.3
-man_MANS+= docs/man/memcached_exist_by_key.3
-man_MANS+= docs/man/memcached_fetch.3
-man_MANS+= docs/man/memcached_fetch_execute.3
-man_MANS+= docs/man/memcached_fetch_result.3
-man_MANS+= docs/man/memcached_flush_buffers.3
-man_MANS+= docs/man/memcached_free.3
-man_MANS+= docs/man/memcached_generate_hash.3
-man_MANS+= docs/man/memcached_generate_hash_value.3
-man_MANS+= docs/man/memcached_get.3
-man_MANS+= docs/man/memcached_get_by_key.3
-man_MANS+= docs/man/memcached_get_memory_allocators.3
-man_MANS+= docs/man/memcached_get_sasl_callbacks.3
-man_MANS+= docs/man/memcached_get_user_data.3
-man_MANS+= docs/man/memcached_increment.3
-man_MANS+= docs/man/memcached_increment_with_initial.3
-man_MANS+= docs/man/memcached_lib_version.3
-man_MANS+= docs/man/memcached_mget.3
-man_MANS+= docs/man/memcached_mget_by_key.3
-man_MANS+= docs/man/memcached_mget_execute.3 
-man_MANS+= docs/man/memcached_mget_execute_by_key.3 
-man_MANS+= docs/man/memcached_pool.3
-man_MANS+= docs/man/memcached_pool_behavior_get.3
-man_MANS+= docs/man/memcached_pool_behavior_set.3
-man_MANS+= docs/man/memcached_pool_create.3
-man_MANS+= docs/man/memcached_pool_destroy.3
-man_MANS+= docs/man/memcached_pool_fetch.3
-man_MANS+= docs/man/memcached_pool_pop.3
-man_MANS+= docs/man/memcached_pool_push.3
-man_MANS+= docs/man/memcached_pool_release.3
-man_MANS+= docs/man/memcached_pool_st.3
-man_MANS+= docs/man/memcached_prepend.3
-man_MANS+= docs/man/memcached_prepend_by_key.3
-man_MANS+= docs/man/memcached_quit.3
-man_MANS+= docs/man/memcached_replace.3
-man_MANS+= docs/man/memcached_replace_by_key.3
-man_MANS+= docs/man/memcached_last_error_message.3
-man_MANS+= docs/man/memcached_sasl_set_auth_data.3
-man_MANS+= docs/man/memcached_server_add.3
-man_MANS+= docs/man/memcached_server_count.3
-man_MANS+= docs/man/memcached_server_cursor.3
-man_MANS+= docs/man/memcached_server_list.3
-man_MANS+= docs/man/memcached_server_list_append.3
-man_MANS+= docs/man/memcached_server_list_count.3
-man_MANS+= docs/man/memcached_server_list_free.3
-man_MANS+= docs/man/memcached_server_push.3
-man_MANS+= docs/man/memcached_servers_parse.3
-man_MANS+= docs/man/memcached_set.3
-man_MANS+= docs/man/memcached_set_by_key.3
-man_MANS+= docs/man/memcached_set_memory_allocators.3
-man_MANS+= docs/man/memcached_set_sasl_callbacks.3
-man_MANS+= docs/man/memcached_set_user_data.3
-man_MANS+= docs/man/memcached_stat.3
-man_MANS+= docs/man/memcached_stat_execute.3
-man_MANS+= docs/man/memcached_stat_get_keys.3
-man_MANS+= docs/man/memcached_stat_get_value.3
-man_MANS+= docs/man/memcached_stat_servername.3
-man_MANS+= docs/man/memcached_strerror.3
-man_MANS+= docs/man/memcached_touch.3
-man_MANS+= docs/man/memcached_touch_by_key.3
-man_MANS+= docs/man/memcached_verbosity.3
-man_MANS+= docs/man/memcached_version.3
-man_MANS+= docs/man/memcapable.1
-man_MANS+= docs/man/memexist.1
-man_MANS+= docs/man/memparse.1
-man_MANS+= docs/man/memping.1
-man_MANS+= docs/man/memcat.1
-man_MANS+= docs/man/memcp.1
-man_MANS+= docs/man/memdump.1
-man_MANS+= docs/man/memtouch.1
-man_MANS+= docs/man/memerror.1
-man_MANS+= docs/man/memflush.1
-man_MANS+= docs/man/memrm.1
-man_MANS+= docs/man/memslap.1
-man_MANS+= docs/man/memstat.1
-
 if HAVE_SPHINX
+
 sphinx-help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
@@ -155,20 +38,23 @@ sphinx-help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 install-html: html-local
-	@rm -r -f /var/www/libmemcaced
-	@cp -r docs/html /var/www/libmemcaced
+	@rm -r -f /var/www/libmemcached/*
+	@cp -r docs/html /var/www/libmemcached
 
-html-local: docs/conf.py changes docs
+docs/_static:
+	@$(mkdir_p) docs/_static
+
+html-local: docs/conf.py docs changes docs/_static
 	PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
 
-dirhtml: docs/conf.py changes
+dirhtml: html-local
 	PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
 
-singlehtml: docs/conf.py changes
+singlehtml: html-local
 	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
@@ -230,10 +116,17 @@ text: docs/conf.py changes
 	@echo
 	@echo "Build finished. The text files are in $(SPHINX_BUILDDIR)/text."
 
-man: docs/conf.py changes
-	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/man
+if HAVE_RECENT_SPHINX
+man:
+	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) ${top_srcdir}/man
 	@echo
-	@echo "Build finished. The manual pages are in $(SPHINX_BUILDDIR)/man."
+	@echo "Build finished. The manual pages are in ${top_srcdir}/man."
+
+else
+
+man:
+
+endif
 
 changes: docs/conf.py linkcheck
 	PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes