Add ability to have version "just requested" when you initially connect.
[m6w6/libmemcached] / libmemcached / include.am
index c290989ec56ee6b2cd519a5a9f7a2baf557687f8..f3525df2cf50fe69e8c1e5db34f7d502f7faf342 100644 (file)
 
 libmemcached_libmemcached_la_SOURCES =
 
-include libmemcached/options/include.am
-
-EXTRA_DIST+= \
-            libmemcached/configure.h.in \
-            libmemcached/libmemcached_probes.d \
-            libmemcached/memcached/README.txt
-
-noinst_HEADERS+= \
-                libmemcached/byteorder.h \
-                libmemcached/common.h \
-                libmemcached/do.h \
-                libmemcached/internal.h \
-                libmemcached/io.h \
-                libmemcached/is.h \
-                libmemcached/libmemcached_probes.h \
-                libmemcached/protocol/ascii_handler.h \
-                libmemcached/protocol/binary_handler.h \
-                libmemcached/protocol/common.h \
-                libmemcached/response.h
-
-nobase_include_HEADERS+= \
-                        libmemcached/allocators.h \
-                        libmemcached/analyze.h \
-                        libmemcached/array.h \
-                        libmemcached/auto.h \
-                        libmemcached/behavior.h \
-                        libmemcached/callback.h \
-                        libmemcached/configure.h \
-                        libmemcached/constants.h \
-                        libmemcached/delete.h \
-                        libmemcached/dump.h \
-                        libmemcached/error.h \
-                        libmemcached/exception.hpp \
-                        libmemcached/fetch.h \
-                        libmemcached/flush.h \
-                        libmemcached/flush_buffers.h \
-                        libmemcached/get.h \
-                        libmemcached/hash.h \
-                        libmemcached/memcached.h \
-                        libmemcached/memcached.hpp \
-                        libmemcached/memcached/protocol_binary.h \
-                        libmemcached/options.h \
-                        libmemcached/parse.h \
-                        libmemcached/prefix_key.h \
-                        libmemcached/protocol/cache.h \
-                        libmemcached/protocol/callback.h \
-                        libmemcached/protocol_handler.h \
-                        libmemcached/quit.h \
-                         libmemcached/platform.h \
-                        libmemcached/result.h \
-                         libmemcached/sasl.h \
-                        libmemcached/server.h \
-                        libmemcached/server_list.h \
-                        libmemcached/stats.h \
-                        libmemcached/storage.h \
-                        libmemcached/strerror.h \
-                        libmemcached/string.h \
-                        libmemcached/types.h \
-                        libmemcached/verbosity.h \
-                        libmemcached/version.h \
-                        libmemcached/visibility.h \
-                        libmemcached/watchpoint.h
-
-lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
-libmemcached_libmemcachedprotocol_la_SOURCES =  \
-                                               libmemcached/protocol/ascii_handler.c \
-                                               libmemcached/protocol/binary_handler.c \
-                                               libmemcached/protocol/cache.c \
-                                               libmemcached/protocol/pedantic.c \
-                                               libmemcached/protocol/protocol_handler.c
-
-libmemcached_libmemcachedprotocol_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
-
-noinst_LTLIBRARIES+= \
-                    libmemcached/libmemcachedcallbacks.la
-
-libmemcached_libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
-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
+include libmemcached/csl/include.am
+
+EXTRA_DIST+= libmemcached/libmemcached_probes.d
+EXTRA_DIST+= libmemcached/memcached/README.txt
+
+nobase_include_HEADERS+= libmemcached/memcached.h
+nobase_include_HEADERS+= libmemcached/memcached.hpp
+nobase_include_HEADERS+= libmemcached/util.h
+
+noinst_HEADERS+= libmemcached/array.h 
+noinst_HEADERS+= libmemcached/assert.hpp 
+noinst_HEADERS+= libmemcached/backtrace.hpp 
+noinst_HEADERS+= libmemcached/byteorder.h 
+noinst_HEADERS+= libmemcached/common.h 
+noinst_HEADERS+= libmemcached/connect.hpp 
+noinst_HEADERS+= libmemcached/continuum.hpp 
+noinst_HEADERS+= libmemcached/do.hpp 
+noinst_HEADERS+= libmemcached/encoding_key.h 
+noinst_HEADERS+= libmemcached/error.hpp 
+noinst_HEADERS+= libmemcached/flag.hpp 
+noinst_HEADERS+= libmemcached/initialize_query.h 
+noinst_HEADERS+= libmemcached/instance.h 
+noinst_HEADERS+= libmemcached/instance.hpp
+noinst_HEADERS+= libmemcached/internal.h 
+noinst_HEADERS+= libmemcached/io.h 
+noinst_HEADERS+= libmemcached/io.hpp 
+noinst_HEADERS+= libmemcached/is.h 
+noinst_HEADERS+= libmemcached/key.hpp 
+noinst_HEADERS+= libmemcached/libmemcached_probes.h 
+noinst_HEADERS+= libmemcached/memcached/protocol_binary.h 
+noinst_HEADERS+= libmemcached/memcached/vbucket.h 
+noinst_HEADERS+= libmemcached/memory.h 
+noinst_HEADERS+= libmemcached/namespace.h 
+noinst_HEADERS+= libmemcached/options.hpp 
+noinst_HEADERS+= libmemcached/response.h 
+noinst_HEADERS+= libmemcached/result.h
+noinst_HEADERS+= libmemcached/sasl.hpp 
+noinst_HEADERS+= libmemcached/server.hpp 
+noinst_HEADERS+= libmemcached/server_instance.h 
+noinst_HEADERS+= libmemcached/socket.hpp 
+noinst_HEADERS+= libmemcached/string.hpp 
+noinst_HEADERS+= libmemcached/udp.hpp 
+noinst_HEADERS+= libmemcached/version.hpp 
+noinst_HEADERS+= libmemcached/virtual_bucket.h 
+noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libmemcached_libmemcached_la_SOURCES+= \
-                                      libmemcached/allocators.c \
-                                      libmemcached/analyze.c \
-                                      libmemcached/array.c \
-                                      libmemcached/auto.c \
-                                      libmemcached/behavior.c \
-                                      libmemcached/connect.c \
-                                      libmemcached/delete.c \
-                                      libmemcached/do.c \
-                                      libmemcached/dump.c \
-                                      libmemcached/error.c \
-                                      libmemcached/fetch.c \
-                                      libmemcached/flush.c \
-                                      libmemcached/flush_buffers.c \
-                                      libmemcached/get.c \
-                                      libmemcached/hash.c \
-                                      libmemcached/hosts.c \
-                                      libmemcached/io.c \
-                                      libmemcached/key.c \
-                                      libmemcached/memcached.c \
-                                      libmemcached/options.cc \
-                                      libmemcached/parse.c \
-                                      libmemcached/prefix_key.cc \
-                                      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 \
-                                      libmemcached/verbosity.c \
-                                      libmemcached/version.c
-
-libmemcached/options.cc: libmemcached/options/parser.h
-
-
-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
-nobase_include_HEADERS+= \
-                        libmemcached/memcached_util.h \
-                        libmemcached/util.h \
-                        libmemcached/util/ping.h \
-                        libmemcached/util/pool.h \
-                        libmemcached/util/version.h
-lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
-endif
-
-libmemcached_libmemcachedutil_la_SOURCES= \
-                                         libmemcached/util/ping.c \
-                                         libmemcached/util/pool.c \
-                                         libmemcached/util/version.c
-libmemcached_libmemcachedutil_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
-libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
-libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
-
-if BUILD_BYTEORDER
-noinst_LTLIBRARIES += libmemcached/libbyteorder.la
-libmemcached_libbyteorder_la_SOURCES= libmemcached/byteorder.c
-libmemcached_libmemcached_la_LIBADD += libmemcached/libbyteorder.la
-libmemcached_libmemcached_la_DEPENDENCIES+= libmemcached/libbyteorder.la
-libmemcached_libmemcachedprotocol_la_LIBADD=libmemcached/libbyteorder.la
-libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
-endif
+libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
+
+libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
+
+libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc
+libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES}
+libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.hpp
+libmemcached_libmemcached_la_SOURCES+= libmemcached/analyze.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/array.c
+libmemcached_libmemcached_la_SOURCES+= libmemcached/auto.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/backtrace.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.hpp
+libmemcached_libmemcached_la_SOURCES+= libmemcached/byteorder.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/callback.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/connect.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/delete.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/do.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/dump.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/error.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/exist.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/fetch.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/flag.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/flush.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/flush_buffers.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/get.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.hpp
+libmemcached_libmemcached_la_SOURCES+= libmemcached/hosts.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/initialize_query.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/io.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/key.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/memcached.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
+libmemcached_libmemcached_la_SOURCES+= libmemcached/response.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/result.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/sasl.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/server.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.hpp
+libmemcached_libmemcached_la_SOURCES+= libmemcached/stats.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c
+
+libmemcached/options.cc: libmemcached/csl/parser.h
+
+
+libmemcached_libmemcached_la_DEPENDENCIES=
+libmemcached_libmemcached_la_LIBADD=
+libmemcached_libmemcached_la_LDFLAGS=
+libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
-libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
+libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
 endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/dtrace_probes.h
-endif
+CLEANFILES+= libmemcached/libmemcached_probes.o
 
-if DTRACE_NEEDS_OBJECTS
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
-CLEANFILES+= libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 endif
 
 SUFFIXES+= .d
 
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
-       $(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
+       $(DTRACE) $(DTRACEFLAGS) -h -o ${top_srcdir}/libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS}
 
 .d.o:
-       $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`
-
+       $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d