Merge in update for document on prefix key.

[m6w6/libmemcached] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 03ba2eb66fbe4b2225e003d969d6c47ae70140dd..e97ff32a3408267e0e79b666e57d9d643693373a 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -79,7 +79,8 @@ 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= \
@@ -88,7 +89,7 @@ POOL_PAGES= \
            memcached_pool_create.pop \
            memcached_pool_destroy.pop \
            memcached_pool_pop.pop \
-           memcached_pool_push.pop 
+           memcached_pool_push.pop
 BUILT_SOURCES += ${POOL_PAGES}
 
 RESULT_PAGES= \
@@ -110,14 +111,14 @@ SERVER_PAGES= \
              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= \
@@ -137,7 +138,8 @@ BUILT_SOURCES += ${SET_PAGES}
 
 STATS_PAGES= \
             memcached_stat.pop \
-            memcached_stat_get_keys.pop .pop\
+            memcached_stat_execute.pop\
+            memcached_stat_get_keys.pop\
             memcached_stat_get_value.pop \
             memcached_stat_servername.pop
 BUILT_SOURCES += ${STATS_PAGES}
@@ -270,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 \
@@ -288,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 = \
@@ -399,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 \
@@ -415,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 \
@@ -427,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/$@
 
@@ -487,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/$@
@@ -510,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