This add AES support.
[m6w6/libmemcached] / libmemcached / include.am
index 88c3a5ca634791c54a853f4dab05e9134ccaf663..448a2e2041973459457999d7e1e992bfda0c792b 100644 (file)
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+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/result.h
+nobase_include_HEADERS+= \
+                        libmemcached/memcached.h \
+                        libmemcached/memcached.hpp \
+                        libmemcached/util.h
+
 noinst_HEADERS+= \
+                libmemcached/array.h \
+                libmemcached/assert.hpp \
+                libmemcached/backtrace.hpp \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
+                libmemcached/connect.hpp \
+                libmemcached/continuum.hpp \
+                libmemcached/do.hpp \
+                libmemcached/encoding_key.h \
+                libmemcached/error.hpp \
+                libmemcached/initialize_query.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
+                libmemcached/io.hpp \
+                libmemcached/is.h \
+                libmemcached/key.hpp \
                 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/auto.h \
-                        libmemcached/behavior.h \
-                        libmemcached/callback.h \
-                        libmemcached/configure.h \
-                        libmemcached/constants.h \
-                        libmemcached/delete.h \
-                        libmemcached/dump.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/parse.h \
-                        libmemcached/protocol/cache.h \
-                        libmemcached/protocol/callback.h \
-                        libmemcached/protocol_handler.h \
-                        libmemcached/quit.h \
-                        libmemcached/result.h \
-                        libmemcached/server.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_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
-
-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
+                libmemcached/memcached/protocol_binary.h \
+                libmemcached/memcached/vbucket.h \
+                libmemcached/memory.h \
+                libmemcached/namespace.h \
+                libmemcached/options.hpp \
+                libmemcached/response.h \
+                libmemcached/sasl.hpp \
+                libmemcached/server.hpp \
+                libmemcached/server_instance.h \
+                libmemcached/socket.hpp \
+                libmemcached/string.hpp \
+                libmemcached/udp.hpp \
+                libmemcached/virtual_bucket.h \
+                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/auto.c \
-                                      libmemcached/behavior.c \
-                                      libmemcached/connect.c \
-                                      libmemcached/delete.c \
-                                      libmemcached/do.c \
-                                      libmemcached/dump.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/parse.c \
-                                      libmemcached/purge.c \
-                                      libmemcached/quit.c \
-                                      libmemcached/response.c \
-                                      libmemcached/result.c \
-                                      libmemcached/server.c \
-                                      libmemcached/stats.c \
-                                      libmemcached/storage.c \
-                                      libmemcached/strerror.c \
-                                      libmemcached/verbosity.c \
-                                      libmemcached/version.c
-
-
-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_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
-
-if BUILD_LIBMEMCACHEDUTIL
-nobase_include_HEADERS+= \
-                        libmemcached/memcached_util.h \
-                        libmemcached/util/pool.h
-lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
-endif
-
-libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
-libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
-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
+libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
+
+libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
+
+libmemcached_libmemcached_la_SOURCES+= \
+                                      ${libhashkit_libhashkit_la_SOURCES} \
+                                      libmemcached/allocators.cc \
+                                      libmemcached/allocators.hpp \
+                                      libmemcached/analyze.cc \
+                                      libmemcached/array.c \
+                                      libmemcached/auto.cc \
+                                      libmemcached/backtrace.cc \
+                                      libmemcached/behavior.cc \
+                                      libmemcached/behavior.hpp \
+                                      libmemcached/byteorder.cc \
+                                      libmemcached/callback.cc \
+                                      libmemcached/connect.cc \
+                                      libmemcached/delete.cc \
+                                      libmemcached/do.cc \
+                                      libmemcached/dump.cc \
+                                      libmemcached/error.cc \
+                                      libmemcached/exist.cc \
+                                      libmemcached/fetch.cc \
+                                      libmemcached/flush.cc \
+                                      libmemcached/flush_buffers.cc \
+                                      libmemcached/get.cc \
+                                      libmemcached/hash.cc \
+                                      libmemcached/hash.hpp \
+                                      libmemcached/hosts.cc \
+                                      libmemcached/initialize_query.cc \
+                                      libmemcached/io.cc \
+                                      libmemcached/key.cc \
+                                      libmemcached/memcached.cc \
+                                      libmemcached/encoding_key.cc \
+                                      libmemcached/namespace.cc \
+                                      libmemcached/options.cc \
+                                      libmemcached/parse.cc \
+                                      libmemcached/purge.cc \
+                                      libmemcached/quit.cc \
+                                      libmemcached/quit.hpp \
+                                      libmemcached/response.cc \
+                                      libmemcached/result.cc \
+                                      libmemcached/sasl.cc \
+                                      libmemcached/server.cc \
+                                      libmemcached/server_list.cc \
+                                      libmemcached/server_list.hpp \
+                                      libmemcached/stats.cc \
+                                      libmemcached/storage.cc \
+                                      libmemcached/strerror.cc \
+                                      libmemcached/string.cc \
+                                      libmemcached/touch.cc \
+                                      libmemcached/verbosity.cc \
+                                      libmemcached/version.cc \
+                                      libmemcached/udp.cc \
+                                      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_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
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
-endif
+CLEANFILES+= libmemcached/dtrace_probes.h
+CLEANFILES+= libmemcached/libmemcached_probes.o
 
-if DTRACE_NEEDS_OBJECTS
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_LIBADD += 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 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)
-       $(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-       $(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS}
 
+.d.o:
+       $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d