Mass rename to simplify names.

[m6w6/libmemcached] / libmemcached / Makefile.am

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index f192eda45b5d6f035cbb5d5ba0ebf33b7cb7c6ac..e85fecb770ec75862185148a71fe155979d6cfde 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,86 +1,124 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
-             memcached_configure.h.in
+EXTRA_DIST = \
+           libmemcached.ver \
+           libmemcached_probes.d \
+           memcached/README.txt \
+           memcached_configure.h.in \
+           protocol/libmemcachedprotocol.ver \
+           util/libmemcachedutil.ver
 
-EXTRA_HEADERS = 
-BUILT_SOURCES= 
+
+EXTRA_HEADERS =
+BUILT_SOURCES=
 
 noinst_HEADERS = libmemcached_probes.h \
-                 memcached_io.h \
-                 memcached_internal.h \
+                 io.h \
+                 internal.h \
                  common.h \
-                 memcached/protocol_binary.h
-
-pkginclude_HEADERS= memcached.h \
-                   memcached.hpp \
+                 memcached/protocol_binary.h \
+                 protocol/common.h \
+                 protocol/ascii_handler.h \
+                 protocol/binary_handler.h
+
+pkginclude_HEADERS= \
+                   behavior.h \
+                   callback.h \
+                   constants.h \
                    exception.hpp \
-                    memcached_configure.h \
-                   memcached_constants.h \
-                   memcached_get.h \
-                   memcached_result.h \
-                   memcached_server.h \
-                   memcached_storage.h \
-                   memcached_string.h \
-                   memcached_types.h \
-                   memcached_watchpoint.h \
-                   visibility.h
-
-
-if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= memcached_util.h memcached_pool.h
-endif
-
-lib_LTLIBRARIES = libmemcached.la
+                   get.h \
+                   memcached.h \
+                   memcached.hpp \
+                   memcached_configure.h \
+                   protocol_handler.h \
+                   result.h \
+                   server.h \
+                   storage.h \
+                   string.h \
+                   types.h \
+                   visibility.h \
+                   watchpoint.h
+
+nobase_pkginclude_HEADERS = \
+                           protocol/cache.h \
+                           protocol/callback.h
+
+
+libmemcachedprotocol_la_SOURCES =  \
+                                   protocol/ascii_handler.c \
+                                   protocol/binary_handler.c \
+                                   protocol/cache.c \
+                                   protocol/pedantic.c \
+                                   protocol/protocol_handler.c
+
+libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
+
+lib_LTLIBRARIES = libmemcached.la libmemcachedprotocol.la
 noinst_LTLIBRARIES = libmemcachedcallbacks.la
 libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
-libmemcachedcallbacks_la_SOURCES = memcached_callback.c
+libmemcachedcallbacks_la_SOURCES = callback.c
 
 libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libmemcached_la_SOURCES = crc.c \
-                         memcached.c \
-                         memcached_auto.c \
-                         memcached_analyze.c \
-                         memcached_behavior.c \
-                         memcached_connect.c \
-                         memcached_delete.c \
-                         memcached_do.c \
-                         memcached_dump.c \
-                         memcached_fetch.c \
-                         memcached_flush.c \
-                         memcached_get.c \
-                         memcached_hash.c \
-                         memcached_hosts.c \
-                         memcached_io.c \
-                         memcached_purge.c \
-                          memcached_flush_buffers.c \
+libmemcached_la_SOURCES = \
+                         allocators.c \
+                         analyze.c \
+                         auto.c \
+                         behavior.c \
+                         connect.c \
+                         crc.c \
+                         delete.c \
+                         do.c \
+                         dump.c \
+                         fetch.c \
+                         flush.c \
+                         flush_buffers.c \
+                         get.c \
+                         hash.c \
+                         hosts.c \
+                         io.c \
+                         jenkins_hash.c \
+                         key.c \
                          md5.c \
-                         memcached_key.c \
-                         memcached_quit.c \
-                         memcached_parse.c \
-                         memcached_response.c \
-                         memcached_result.c \
-                         memcached_server.c \
-                         memcached_storage.c \
-                         memcached_string.c \
-                         memcached_stats.c \
-                         memcached_strerror.c \
-                         memcached_verbosity.c \
-                         memcached_version.c \
+                         memcached.c \
                          murmur_hash.c \
-                         jenkins_hash.c \
-                          memcached_allocators.c
+                         parse.c \
+                         purge.c \
+                         quit.c \
+                         response.c \
+                         result.c \
+                         server.c \
+                         stats.c \
+                         storage.c \
+                         strerror.c \
+                         string.c \
+                         verbosity.c \
+                         version.c
 
 
 if INCLUDE_HSIEH_SRC
 libmemcached_la_SOURCES += hsieh_hash.c
 endif
 
-if BUILD_BYTEORDER
-libmemcached_la_SOURCES += byteorder.c
-endif
-
 libmemcached_la_DEPENDENCIES= libmemcachedcallbacks.la
 libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
+libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h pool.h
+lib_LTLIBRARIES+= libmemcachedutil.la
+endif
+
+libmemcachedutil_la_SOURCES= util/pool.c
+libmemcachedutil_la_LIBADD= libmemcached.la
+libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcachedutil_la_DEPENDENCIES=libmemcached.la
+
+if BUILD_BYTEORDER
+noinst_LTLIBRARIES += libbyteorder.la
+libbyteorder_la_SOURCES= byteorder.c byteorder.h
+libmemcached_la_LIBADD += libbyteorder.la
+libmemcached_la_DEPENDENCIES+= libbyteorder.la
+libmemcachedprotocol_la_LIBADD=libbyteorder.la
+libmemcachedprotocol_la_DEPENDENCIES=libbyteorder.la
+endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= dtrace_probes.h