Merge

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 5ae5850714dd93b01d6b1c19646404e8f40406b1..0da3de330d7a06db80b005131ba7dbfb457a3465 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -7,10 +7,14 @@ libmemcached_libmemcached_la_SOURCES =
 include libmemcached/csl/include.am
 
 EXTRA_DIST+= \
-            libmemcached/configure.h.in \
             libmemcached/libmemcached_probes.d \
             libmemcached/memcached/README.txt
 
+nobase_include_HEADERS+= \
+                        libmemcached/memcached.h \
+                        libmemcached/memcached.hpp \
+                        libmemcached/util.h
+
 noinst_HEADERS+= \
                 libmemcached/array.h \
                 libmemcached/assert.hpp \
@@ -18,6 +22,7 @@ noinst_HEADERS+= \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
                 libmemcached/continuum.hpp \
+                libmemcached/close_socket.hpp \
                 libmemcached/do.hpp \
                 libmemcached/error.hpp \
                 libmemcached/initialize_query.h \
@@ -25,16 +30,13 @@ noinst_HEADERS+= \
                 libmemcached/io.h \
                 libmemcached/io.hpp \
                 libmemcached/is.h \
+                libmemcached/key.hpp \
                 libmemcached/libmemcached_probes.h \
+                libmemcached/memcached/protocol_binary.h \
+                libmemcached/memcached/vbucket.h \
                 libmemcached/memory.h \
                 libmemcached/namespace.h \
                 libmemcached/options.hpp \
-                libmemcached/memcached/protocol_binary.h \
-                libmemcached/memcached/vbucket.h \
-                libmemcached/protocol/ascii_handler.h \
-                libmemcached/protocol/binary_handler.h \
-                libmemcached/protocol/cache.h \
-                libmemcached/protocol/common.h \
                 libmemcached/response.h \
                 libmemcached/server.hpp \
                 libmemcached/server_instance.h \
@@ -67,6 +69,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/flush.cc \
                                       libmemcached/flush_buffers.cc \
                                       libmemcached/get.cc \
+                                      libmemcached/touch.cc \
                                       libmemcached/hash.cc \
                                       libmemcached/hosts.cc \
                                       libmemcached/initialize_query.cc \
@@ -95,6 +98,7 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
+libmemcached_libmemcached_la_LDFLAGS=
 if TARGET_LINUX
 libmemcached_libmemcached_la_LIBADD+= -lm
 endif