X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=docs%2FMakefile.am;h=e97ff32a3408267e0e79b666e57d9d643693373a;hb=9c7e4d791a127f8ae46aaddc531319da1f34b5ba;hp=33073dca0ec29a503b3af9ccd1ea293a5c63d4f8;hpb=04bbb4383e54d431a3513045dad4be62b91c64af;p=m6w6%2Flibmemcached diff --git a/docs/Makefile.am b/docs/Makefile.am index 33073dca..e97ff32a 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -14,26 +14,27 @@ BUILT_SOURCES= EXTRA_DIST= make_index.pl AUTO_PAGES= \ - memcached_increment.pop \ - memcached_increment_with_initial.pop \ - memcached_decrement.pop \ - memcached_decrement_with_initial.pop + memcached_increment.pop \ + memcached_increment_with_initial.pop \ + memcached_decrement.pop \ + memcached_decrement_with_initial.pop BUILT_SOURCES += ${AUTO_PAGES} BEHAVIOR_PAGES= \ - memcached_behavior_get.pop \ - memcached_behavior_set.pop + memcached_behavior_get.pop \ + memcached_behavior_set.pop BUILT_SOURCES += ${BEHAVIOR_PAGES} CALLBACK_PAGES= \ - memcached_callback_get.pop \ - memcached_callback_set.pop + memcached_callback_get.pop \ + memcached_callback_set.pop BUILT_SOURCES += ${CALLBACK_PAGES} CREATE_PAGES= \ - memcached_create.pop \ - memcached_free.pop \ - memcached_clone.pop + memcached_clone.pop \ + memcached_create.pop \ + memcached_free.pop \ + memcached_servers_reset.pop BUILT_SOURCES += ${CREATE_PAGES} DELETE_PAGES= \ @@ -42,26 +43,26 @@ DELETE_PAGES= \ BUILT_SOURCES += ${DELETE_PAGES} GENERIC_PAGES= \ - libmemcached.pop \ - libmemcached_examples.pop \ - libmemcachedutil.pop \ - memcached_analyze.pop \ - memcached_dump.pop \ - memcached_flush.pop \ - memcached_flush_buffers.pop \ - memcached_generate_hash_value.pop \ - memcached_quit.pop \ - memcached_strerror.pop \ - memcached_verbosity.pop \ - memcapable.pop \ - memcat.pop \ - memcp.pop \ - memdump.pop \ - memerror.pop \ - memflush.pop \ - memrm.pop \ - memslap.pop \ - memstat.pop + libmemcached.pop \ + libmemcached_examples.pop \ + libmemcachedutil.pop \ + memcached_analyze.pop \ + memcached_dump.pop \ + memcached_flush.pop \ + memcached_flush_buffers.pop \ + memcached_generate_hash_value.pop \ + memcached_quit.pop \ + memcached_strerror.pop \ + memcached_verbosity.pop \ + memcapable.pop \ + memcat.pop \ + memcp.pop \ + memdump.pop \ + memerror.pop \ + memflush.pop \ + memrm.pop \ + memslap.pop \ + memstat.pop BUILT_SOURCES += ${GENERIC_PAGES} GET_PAGES= \ @@ -78,16 +79,17 @@ BUILT_SOURCES += ${GET_PAGES} MEMORY_ALLOCATORS_PAGES= \ memcached_get_memory_allocators.pop \ - memcached_set_memory_allocators.pop + memcached_set_memory_allocators.pop \ + memcached_set_memory_allocators_context.pop BUILT_SOURCES += ${MEMORY_ALLOCATORS_PAGES} POOL_PAGES= \ - memcached_pool_behavior_get.pop \ - memcached_pool_behavior_set.pop \ - memcached_pool_create.pop \ - memcached_pool_destroy.pop \ - memcached_pool_pop.pop \ - memcached_pool_push.pop + memcached_pool_behavior_get.pop \ + memcached_pool_behavior_set.pop \ + memcached_pool_create.pop \ + memcached_pool_destroy.pop \ + memcached_pool_pop.pop \ + memcached_pool_push.pop BUILT_SOURCES += ${POOL_PAGES} RESULT_PAGES= \ @@ -105,17 +107,18 @@ BUILT_SOURCES += ${RESULT_PAGES} SERVER_PAGES= \ memcached_server_count.pop \ + memcached_server_cursor.pop \ memcached_server_list.pop \ memcached_server_add.pop \ memcached_server_add_unix_socket.pop \ - memcached_server_push.pop + memcached_server_push.pop BUILT_SOURCES += ${SERVER_PAGES} SERVER_ST_PAGES= \ memcached_server_list_free.pop \ memcached_server_list_count.pop \ memcached_server_list_append.pop \ - memcached_servers_parse.pop + memcached_servers_parse.pop BUILT_SOURCES += ${SERVER_ST_PAGES} SET_PAGES= \ @@ -134,10 +137,11 @@ SET_PAGES= \ BUILT_SOURCES += ${SET_PAGES} STATS_PAGES= \ - memcached_stat.pop \ - memcached_stat_get_keys.pop .pop\ - memcached_stat_get_value.pop \ - memcached_stat_servername.pop + memcached_stat.pop \ + memcached_stat_execute.pop\ + memcached_stat_get_keys.pop\ + memcached_stat_get_value.pop \ + memcached_stat_servername.pop BUILT_SOURCES += ${STATS_PAGES} USER_DATA_PAGES= \ @@ -155,27 +159,27 @@ BUILT_SOURCES += ${VERSION_PAGES} # These are for libhashkit # HASHKIT_CREATE_PAGES= \ - hashkit_is_allocated.pop \ - hashkit_create.pop \ - hashkit_clone.pop \ - hashkit_free.pop + hashkit_is_allocated.pop \ + hashkit_create.pop \ + hashkit_clone.pop \ + hashkit_free.pop BUILT_SOURCES += ${HASHKIT_CREATE_PAGES} HASHKIT_FUNCTIONS_PAGES= \ - hashkit_crc32.pop \ - hashkit_fnv1_32.pop \ - hashkit_fnv1_64.pop \ - hashkit_fnv1a_32.pop \ - hashkit_fnv1a_64.pop \ - hashkit_functions.pop \ - hashkit_hsieh.pop \ - hashkit_jenkins.pop \ - hashkit_md5.pop \ - hashkit_murmur.pop + hashkit_crc32.pop \ + hashkit_fnv1_32.pop \ + hashkit_fnv1_64.pop \ + hashkit_fnv1a_32.pop \ + hashkit_fnv1a_64.pop \ + hashkit_functions.pop \ + hashkit_hsieh.pop \ + hashkit_jenkins.pop \ + hashkit_md5.pop \ + hashkit_murmur.pop BUILT_SOURCES += ${HASHKIT_FUNCTIONS_PAGES} HASHKIT_ST_PAGES= \ - hashkit_value.pop + hashkit_value.pop BUILT_SOURCES += ${HASHKIT_ST_PAGES} @@ -257,6 +261,7 @@ HTML_FILES= \ memcached_server_add.html \ memcached_server_add_unix_socket.html \ memcached_server_count.html \ + memcached_server_cursor.html \ memcached_server_list_append.html \ memcached_server_list_count.html \ memcached_server_list_free.html \ @@ -267,6 +272,7 @@ HTML_FILES= \ memcached_set_memory_allocators.html \ memcached_set.html \ memcached_set_user_data.html \ + memcached_stat_execute.html \ memcached_stat_get_keys.html \ memcached_stat_get_value.html \ memcached_stat.html \ @@ -285,43 +291,45 @@ HTML_FILES= \ memstat.html POD_FILES= \ - hashkit_create.pod \ - hashkit_functions.pod \ - hashkit_value.pod \ - libmemcached.pod \ - libmemcached_examples.pod \ - libmemcachedutil.pod \ - memcached_analyze.pod \ - memcached_auto.pod \ - memcached_behavior.pod \ - memcached_callback.pod \ - memcached_create.pod \ - memcached_delete.pod \ - memcached_dump.pod \ - memcached_flush.pod \ - memcached_flush_buffers.pod \ - memcached_generate_hash_value.pod \ - memcached_get.pod \ - memcached_memory_allocators.pod \ - memcached_pool.pod \ - memcached_quit.pod \ - memcached_server_st.pod \ - memcached_servers.pod \ - memcached_set.pod \ - memcached_stats.pod \ - memcached_strerror.pod \ - memcached_user_data.pod \ - memcached_verbosity.pod \ - memcached_version.pod \ - memcapable.pod \ - memcat.pod \ - memcp.pod \ - memdump.pod \ - memerror.pod \ - memflush.pod \ - memrm.pod \ - memslap.pod \ - memstat.pod + hashkit_create.pod \ + hashkit_functions.pod \ + hashkit_value.pod \ + libmemcached.pod \ + libmemcached_examples.pod \ + libmemcachedutil.pod \ + memcached_analyze.pod \ + memcached_auto.pod \ + memcached_behavior.pod \ + memcached_callback.pod \ + memcached_create.pod \ + memcached_delete.pod \ + memcached_dump.pod \ + memcached_flush.pod \ + memcached_flush_buffers.pod \ + memcached_generate_hash_value.pod \ + memcached_get.pod \ + memcached_memory_allocators.pod \ + memcached_pool.pod \ + memcached_quit.pod \ + memcached_result_st.pod \ + memcached_sasl.pod \ + memcached_server_st.pod \ + memcached_servers.pod \ + memcached_set.pod \ + memcached_stats.pod \ + memcached_strerror.pod \ + memcached_user_data.pod \ + memcached_verbosity.pod \ + memcached_version.pod \ + memcapable.pod \ + memcat.pod \ + memcp.pod \ + memdump.pod \ + memerror.pod \ + memflush.pod \ + memrm.pod \ + memslap.pod \ + memstat.pod EXTRA_DIST+= $(POD_FILES) man_MANS = \ @@ -384,6 +392,7 @@ man_MANS = \ memcached_replace_by_key.3 \ memcached_server_add.3 \ memcached_server_count.3 \ + memcached_server_cursor.3 \ memcached_server_list.3 \ memcached_server_list_append.3 \ memcached_server_list_count.3 \ @@ -395,6 +404,7 @@ man_MANS = \ memcached_set_memory_allocators.3 \ memcached_set_user_data.3 \ memcached_stat.3 \ + memcached_stat_execute.3 \ memcached_stat_get_keys.3 \ memcached_stat_get_value.3 \ memcached_stat_servername.3 \ @@ -411,6 +421,34 @@ man_MANS = \ memslap.1 \ memstat.1 +if HAVE_SASL +POD_FILES+= memcached_sasl.pod +man_MANS+= \ + memcached_destroy_sasl_auth_data.3 \ + memcached_get_sasl_callbacks.3 \ + memcached_sasl_set_auth_data.3 \ + memcached_set_sasl_callbacks.3 + +HTML_FILES+= \ + memcached_destroy_sasl_auth_data.html \ + memcached_get_sasl_callbacks.html \ + memcached_sasl_set_auth_data.html \ + memcached_set_sasl_callbacks.html + + +SASL_PAGES= \ + memcached_destroy_sasl_auth_data.pop \ + memcached_get_sasl_callbacks.pop \ + memcached_sasl_set_auth_data.pop \ + memcached_set_sasl_callbacks.pop +BUILT_SOURCES += ${SASL_PAGES} + +${SASL_PAGES}: + @rm -f $@ + ln -s ${top_srcdir}/docs/memcached_sasl.pod ${top_builddir}/docs/$@ + +endif + if BUILD_LIBMEMCACHEDUTIL man_MANS+= \ libmemcachedutil.3 \ @@ -423,11 +461,11 @@ man_MANS+= \ endif -${CREATE_PAGES}: +${CREATE_PAGES}: @rm -f $@ ln -s ${top_srcdir}/docs/memcached_create.pod ${top_builddir}/docs/$@ -${SET_PAGES}: +${SET_PAGES}: @rm -f $@ ln -s ${top_srcdir}/docs/memcached_set.pod ${top_builddir}/docs/$@ @@ -483,7 +521,6 @@ ${USER_DATA_PAGES}: @rm -f $@ ln -s ${top_srcdir}/docs/memcached_user_data.pod ${top_builddir}/docs/$@ - ${POOL_PAGES}: @rm -f $@ ln -s ${top_srcdir}/docs/memcached_pool.pod ${top_builddir}/docs/$@ @@ -506,7 +543,7 @@ test-docs: $(POD_FILES) html-local: html-pages html-index -html-pages: $(HTML_FILES) +html-pages: $(HTML_FILES) html-index: html-pages perl make_index.pl *.html > index.html