projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge build trunk.
[m6w6/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 03a327da327863eca093b7788fddb77e17dfe7f4..a10b92a5aa5363fcaeb67b252824d98c37834ba2 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-20,7
+20,9
@@
noinst_HEADERS+= \
libmemcached/assert.hpp \
libmemcached/backtrace.hpp \
libmemcached/byteorder.h \
libmemcached/assert.hpp \
libmemcached/backtrace.hpp \
libmemcached/byteorder.h \
+ libmemcached/close_socket.hpp \
libmemcached/common.h \
libmemcached/common.h \
+ libmemcached/connect.hpp \
libmemcached/continuum.hpp \
libmemcached/do.hpp \
libmemcached/error.hpp \
libmemcached/continuum.hpp \
libmemcached/do.hpp \
libmemcached/error.hpp \
@@
-40,6
+42,7
@@
noinst_HEADERS+= \
libmemcached/server.hpp \
libmemcached/server_instance.h \
libmemcached/string.hpp \
libmemcached/server.hpp \
libmemcached/server_instance.h \
libmemcached/string.hpp \
+ libmemcached/udp.hpp \
libmemcached/virtual_bucket.h \
libmemcached/watchpoint.h
libmemcached/virtual_bucket.h \
libmemcached/watchpoint.h
@@
-51,11
+54,13
@@
libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_SOURCES+= \
${libhashkit_libhashkit_la_SOURCES} \
libmemcached/allocators.cc \
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/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/byteorder.cc \
libmemcached/callback.cc \
libmemcached/connect.cc \
@@
-69,26
+74,32
@@
libmemcached_libmemcached_la_SOURCES+= \
libmemcached/flush_buffers.cc \
libmemcached/get.cc \
libmemcached/hash.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/hosts.cc \
libmemcached/initialize_query.cc \
libmemcached/io.cc \
libmemcached/key.cc \
libmemcached/memcached.cc \
+ libmemcached/namespace.cc \
libmemcached/options.cc \
libmemcached/parse.cc \
libmemcached/options.cc \
libmemcached/parse.cc \
- libmemcached/namespace.cc \
libmemcached/purge.cc \
libmemcached/quit.cc \
libmemcached/purge.cc \
libmemcached/quit.cc \
+ libmemcached/quit.hpp \
libmemcached/response.cc \
libmemcached/result.cc \
libmemcached/response.cc \
libmemcached/result.cc \
+ libmemcached/sasl.hpp \
libmemcached/server.cc \
libmemcached/server_list.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/stats.cc \
libmemcached/storage.cc \
libmemcached/strerror.cc \
libmemcached/string.cc \
+ libmemcached/touch.cc \
libmemcached/verbosity.cc \
libmemcached/version.cc \
libmemcached/verbosity.cc \
libmemcached/version.cc \
+ libmemcached/udp.cc \
libmemcached/virtual_bucket.c
libmemcached/options.cc: libmemcached/csl/parser.h
libmemcached/virtual_bucket.c
libmemcached/options.cc: libmemcached/csl/parser.h
@@
-96,9
+107,7
@@
libmemcached/options.cc: libmemcached/csl/parser.h
libmemcached_libmemcached_la_DEPENDENCIES=
libmemcached_libmemcached_la_LIBADD=
libmemcached_libmemcached_la_DEPENDENCIES=
libmemcached_libmemcached_la_LIBADD=
-if TARGET_LINUX
-libmemcached_libmemcached_la_LIBADD+= -lm
-endif
+libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)