Merge trunk

[m6w6/libmemcached] / libmemcached / Makefile.am

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index ad0dbf44409cd3e0f522e12ae87a4a317916d83d..14491446b61af7587cc4f671e6c60594a92f5d3a 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,6 +1,8 @@
 EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
              memcached_configure.h.in
 
+SUBDIRS = . protocol
+
 EXTRA_HEADERS =
 BUILT_SOURCES=
 
@@ -22,8 +24,12 @@ pkginclude_HEADERS= memcached.h \
                    memcached_string.h \
                    memcached_types.h \
                    memcached_watchpoint.h \
+                    protocol_handler.h \
                    visibility.h
 
+nobase_pkginclude_HEADERS=protocol/cache.h \
+                    protocol/callback.h
+
 
 if BUILD_LIBMEMCACHEDUTIL
 pkginclude_HEADERS+= memcached_util.h memcached_pool.h