projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 41c5c5972f3e2edb034da68886d5bae25c95be86..e318f7edfd6eb16f37753f017d4b3998f72a1af2 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-10,6
+10,7
@@
EXTRA_DIST+= \
noinst_HEADERS+= \
libmemcached/byteorder.h \
libmemcached/common.h \
noinst_HEADERS+= \
libmemcached/byteorder.h \
libmemcached/common.h \
+ libmemcached/do.h \
libmemcached/internal.h \
libmemcached/io.h \
libmemcached/libmemcached_probes.h \
libmemcached/internal.h \
libmemcached/io.h \
libmemcached/libmemcached_probes.h \
@@
-19,27
+20,41
@@
noinst_HEADERS+= \
libmemcached/response.h
nobase_include_HEADERS+= \
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/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/dump.h \
libmemcached/exception.hpp \
+ libmemcached/fetch.h \
+ libmemcached/flush.h \
+ libmemcached/flush_buffers.h \
libmemcached/get.h \
libmemcached/get.h \
+ libmemcached/hash.h \
libmemcached/memcached.h \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
libmemcached/memcached.h \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
+ libmemcached/parse.h \
+ libmemcached/platform.h \
libmemcached/protocol/cache.h \
libmemcached/protocol/callback.h \
libmemcached/protocol_handler.h \
libmemcached/protocol/cache.h \
libmemcached/protocol/callback.h \
libmemcached/protocol_handler.h \
+ libmemcached/quit.h \
libmemcached/result.h \
libmemcached/result.h \
+ libmemcached/sasl.h \
libmemcached/server.h \
libmemcached/server.h \
+ libmemcached/server_list.h \
libmemcached/stats.h \
libmemcached/storage.h \
libmemcached/stats.h \
libmemcached/storage.h \
+ libmemcached/strerror.h \
libmemcached/string.h \
libmemcached/types.h \
libmemcached/string.h \
libmemcached/types.h \
+ libmemcached/verbosity.h \
+ libmemcached/version.h \
libmemcached/visibility.h \
libmemcached/watchpoint.h
libmemcached/visibility.h \
libmemcached/watchpoint.h
@@
-51,7
+66,8
@@
libmemcached_libmemcachedprotocol_la_SOURCES = \
libmemcached/protocol/pedantic.c \
libmemcached/protocol/protocol_handler.c
libmemcached/protocol/pedantic.c \
libmemcached/protocol/protocol_handler.c
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+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
noinst_LTLIBRARIES+= \
libmemcached/libmemcachedcallbacks.la
@@
-62,9
+78,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
# 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}
lib_LTLIBRARIES+= libmemcached/libmemcached.la
libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
@@
-74,7
+90,6
@@
libmemcached_libmemcached_la_SOURCES = \
libmemcached/auto.c \
libmemcached/behavior.c \
libmemcached/connect.c \
libmemcached/auto.c \
libmemcached/behavior.c \
libmemcached/connect.c \
- libmemcached/crc.c \
libmemcached/delete.c \
libmemcached/do.c \
libmemcached/dump.c \
libmemcached/delete.c \
libmemcached/do.c \
libmemcached/dump.c \
@@
-85,17
+100,15
@@
libmemcached_libmemcached_la_SOURCES = \
libmemcached/hash.c \
libmemcached/hosts.c \
libmemcached/io.c \
libmemcached/hash.c \
libmemcached/hosts.c \
libmemcached/io.c \
- libmemcached/jenkins_hash.c \
libmemcached/key.c \
libmemcached/key.c \
- libmemcached/md5.c \
libmemcached/memcached.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/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/stats.c \
libmemcached/storage.c \
libmemcached/strerror.c \
@@
-103,24
+116,27
@@
libmemcached_libmemcached_la_SOURCES = \
libmemcached/version.c
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
-libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.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
nobase_include_HEADERS+= \
libmemcached/memcached_util.h \
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
+ libmemcached/util.h \
+ libmemcached/util/ping.h \
+ libmemcached/util/pool.h \
+ libmemcached/util/version.h
lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
endif
lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
endif
-libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
+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_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS}
-version-info 0:0:0
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS}
${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
if BUILD_BYTEORDER
libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
if BUILD_BYTEORDER
@@
-132,21
+148,30
@@
libmemcached_libmemcachedprotocol_la_LIBADD=libmemcached/libbyteorder.la
libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
endif
libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
endif
+if HAVE_SASL
+libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+endif
+
if HAVE_DTRACE
BUILT_SOURCES+= libmemcached/dtrace_probes.h
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
endif
if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
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
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\//"`