File shuffling

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index a786b222a6cc3a709e1a680cc11ac8f067d20106..737c5e12e5c312d4c7b17c84e0fbf5dc96c09d84 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -10,6 +10,7 @@ EXTRA_DIST+= \
 noinst_HEADERS+= \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
+                libmemcached/do.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
                 libmemcached/libmemcached_probes.h \
@@ -44,6 +45,7 @@ nobase_include_HEADERS+= \
                         libmemcached/quit.h \
                         libmemcached/result.h \
                         libmemcached/server.h \
+                        libmemcached/server_list.h \
                         libmemcached/stats.h \
                         libmemcached/storage.h \
                         libmemcached/strerror.h \
@@ -73,9 +75,9 @@ libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
 # This noinst lib contains things we want to be ABI private but still want to
 # either use in client programs or be able to test in test cases
 # These symbols will not be exposed in the shipped .so
-noinst_LTLIBRARIES+= \
-                    libmemcached/libmemcachedinternal.la
-libmemcached_libmemcachedinternal_la_SOURCES = libmemcached/string.c
+noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
+libmemcached_libmemcachedinternal_la_SOURCES= \
+                                             libmemcached/string.c
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
@@ -85,7 +87,6 @@ libmemcached_libmemcached_la_SOURCES = \
                                       libmemcached/auto.c \
                                       libmemcached/behavior.c \
                                       libmemcached/connect.c \
-                                      libmemcached/crc.c \
                                       libmemcached/delete.c \
                                       libmemcached/do.c \
                                       libmemcached/dump.c \
@@ -96,17 +97,15 @@ libmemcached_libmemcached_la_SOURCES = \
                                       libmemcached/hash.c \
                                       libmemcached/hosts.c \
                                       libmemcached/io.c \
-                                      libmemcached/jenkins_hash.c \
                                       libmemcached/key.c \
-                                      libmemcached/md5.c \
                                       libmemcached/memcached.c \
-                                      libmemcached/murmur_hash.c \
                                       libmemcached/parse.c \
                                       libmemcached/purge.c \
                                       libmemcached/quit.c \
                                       libmemcached/response.c \
                                       libmemcached/result.c \
                                       libmemcached/server.c \
+                                      libmemcached/server_list.c \
                                       libmemcached/stats.c \
                                       libmemcached/storage.c \
                                       libmemcached/strerror.c \
@@ -114,12 +113,8 @@ libmemcached_libmemcached_la_SOURCES = \
                                       libmemcached/version.c
 
 
-if INCLUDE_HSIEH_SRC
-libmemcached_libmemcached_la_SOURCES += libmemcached/hsieh_hash.c
-endif
-
-libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkit.la
-libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkit.la
+libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
+libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
 libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if BUILD_LIBMEMCACHEDUTIL