X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=bd07da6d5d8348703d64b185bc57f2545412ba34;hb=f0cc25810bfd089de866bd0d1e35c3157e86a930;hp=737c5e12e5c312d4c7b17c84e0fbf5dc96c09d84;hpb=ba24508f51eed2af4f0192589801db2f945eac7b;p=awesomized%2Flibmemcached diff --git a/libmemcached/include.am b/libmemcached/include.am index 737c5e12..bd07da6d 100644 --- a/libmemcached/include.am +++ b/libmemcached/include.am @@ -2,6 +2,10 @@ # included from Top Level Makefile.am # All paths should be given relative to the root +libmemcached_libmemcached_la_SOURCES = + +include libmemcached/options/include.am + EXTRA_DIST+= \ libmemcached/configure.h.in \ libmemcached/libmemcached_probes.d \ @@ -10,25 +14,33 @@ EXTRA_DIST+= \ noinst_HEADERS+= \ libmemcached/byteorder.h \ libmemcached/common.h \ - libmemcached/do.h \ + libmemcached/do.hpp \ + libmemcached/error.hpp \ + libmemcached/initialize_query.h \ libmemcached/internal.h \ libmemcached/io.h \ + libmemcached/is.h \ libmemcached/libmemcached_probes.h \ + libmemcached/memory.h \ libmemcached/protocol/ascii_handler.h \ libmemcached/protocol/binary_handler.h \ libmemcached/protocol/common.h \ - libmemcached/response.h + libmemcached/response.h \ + libmemcached/virtual_bucket.h nobase_include_HEADERS+= \ libmemcached/allocators.h \ libmemcached/analyze.h \ + libmemcached/array.h \ libmemcached/auto.h \ + libmemcached/basic_string.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 \ @@ -38,12 +50,18 @@ nobase_include_HEADERS+= \ libmemcached/memcached.h \ libmemcached/memcached.hpp \ libmemcached/memcached/protocol_binary.h \ + libmemcached/memcached/vbucket.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/return.h \ + libmemcached/platform.h \ libmemcached/result.h \ + libmemcached/sasl.h \ libmemcached/server.h \ libmemcached/server_list.h \ libmemcached/stats.h \ @@ -56,103 +74,107 @@ nobase_include_HEADERS+= \ 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/array.c \ + libmemcached/error.cc \ + libmemcached/string.cc +libmemcached_libmemcachedinternal_la_CFLAGS= \ + ${AM_CFLAGS} \ + ${NO_CONVERSION} \ + -DBUILDING_LIBMEMCACHED + +libmemcached_libmemcachedinternal_la_CXXFLAGS= \ + ${AM_CXXFLAGS} \ + ${NO_CONVERSION} \ + -DBUILDING_LIBMEMCACHED 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/server_list.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/libhashkitinc.la -libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la +libmemcached_libmemcached_la_CFLAGS= \ + ${AM_CFLAGS} \ + ${NO_CONVERSION} \ + -DBUILDING_LIBMEMCACHED + +libmemcached_libmemcached_la_CXXFLAGS= \ + ${AM_CXXFLAGS} \ + ${NO_CONVERSION} \ + -DBUILDING_LIBMEMCACHED + +libmemcached_libmemcached_la_SOURCES+= \ + ${libhashkit_libhashkit_la_SOURCES} \ + libmemcached/allocators.cc \ + libmemcached/analyze.cc \ + libmemcached/array.c \ + libmemcached/auto.cc \ + libmemcached/behavior.cc \ + libmemcached/byteorder.cc \ + libmemcached/callback.cc \ + libmemcached/connect.cc \ + libmemcached/delete.cc \ + libmemcached/do.cc \ + libmemcached/dump.cc \ + libmemcached/error.cc \ + libmemcached/fetch.cc \ + libmemcached/flush.cc \ + libmemcached/flush_buffers.cc \ + libmemcached/get.cc \ + libmemcached/hash.cc \ + libmemcached/hosts.cc \ + libmemcached/initialize_query.cc \ + libmemcached/io.cc \ + libmemcached/key.cc \ + libmemcached/memcached.cc \ + libmemcached/options.cc \ + libmemcached/parse.cc \ + libmemcached/prefix_key.cc \ + libmemcached/purge.cc \ + libmemcached/quit.cc \ + libmemcached/response.cc \ + libmemcached/result.cc \ + libmemcached/server.cc \ + libmemcached/server_list.cc \ + libmemcached/stats.cc \ + libmemcached/storage.cc \ + libmemcached/strerror.cc \ + libmemcached/string.cc \ + libmemcached/verbosity.cc \ + libmemcached/version.cc \ + libmemcached/virtual_bucket.c + +libmemcached/options.cc: libmemcached/options/parser.h + + +libmemcached_libmemcached_la_DEPENDENCIES= +libmemcached_libmemcached_la_LIBADD= $(LIBM) 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 +if HAVE_SASL +libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2) +libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c endif if HAVE_DTRACE BUILT_SOURCES+= libmemcached/dtrace_probes.h -libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d +CLEANFILES+= libmemcached/dtrace_probes.h endif 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 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 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) - $(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\' ` +.d.o: + $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`