projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in version update (0.51)
[awesomized/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 28c5513a4cbc7742ff856176ec720b27ea7cdc90..1c2036bf1b05fd909f15719ebac4fbe5d877352c 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-12,14
+12,19
@@
EXTRA_DIST+= \
libmemcached/memcached/README.txt
noinst_HEADERS+= \
libmemcached/memcached/README.txt
noinst_HEADERS+= \
+ libmemcached/assert.hpp \
+ libmemcached/backtrace.hpp \
libmemcached/byteorder.h \
libmemcached/common.h \
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/initialize_query.h \
libmemcached/internal.h \
libmemcached/io.h \
libmemcached/is.h \
libmemcached/libmemcached_probes.h \
+ libmemcached/memory.h \
+ libmemcached/options.hpp \
libmemcached/protocol/ascii_handler.h \
libmemcached/protocol/binary_handler.h \
libmemcached/protocol/common.h \
libmemcached/protocol/ascii_handler.h \
libmemcached/protocol/binary_handler.h \
libmemcached/protocol/common.h \
@@
-31,6
+36,7
@@
nobase_include_HEADERS+= \
libmemcached/analyze.h \
libmemcached/array.h \
libmemcached/auto.h \
libmemcached/analyze.h \
libmemcached/array.h \
libmemcached/auto.h \
+ libmemcached/basic_string.h \
libmemcached/behavior.h \
libmemcached/callback.h \
libmemcached/configure.h \
libmemcached/behavior.h \
libmemcached/callback.h \
libmemcached/configure.h \
@@
-50,7
+56,7
@@
nobase_include_HEADERS+= \
libmemcached/memcached/vbucket.h \
libmemcached/options.h \
libmemcached/parse.h \
libmemcached/memcached/vbucket.h \
libmemcached/options.h \
libmemcached/parse.h \
- libmemcached/
prefix_key
.h \
+ libmemcached/
namespace
.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 \
@@
-76,8
+82,19
@@
nobase_include_HEADERS+= \
# These symbols will not be exposed in the shipped .so
noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
libmemcached_libmemcachedinternal_la_SOURCES= \
# These symbols will not be exposed in the shipped .so
noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
libmemcached_libmemcachedinternal_la_SOURCES= \
+ libmemcached/array.c \
+ libmemcached/backtrace.cc \
libmemcached/error.cc \
libmemcached/string.cc
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= \
lib_LTLIBRARIES+= libmemcached/libmemcached.la
libmemcached_libmemcached_la_CFLAGS= \
@@
-96,6
+113,7
@@
libmemcached_libmemcached_la_SOURCES+= \
libmemcached/analyze.cc \
libmemcached/array.c \
libmemcached/auto.cc \
libmemcached/analyze.cc \
libmemcached/array.c \
libmemcached/auto.cc \
+ libmemcached/backtrace.cc \
libmemcached/behavior.cc \
libmemcached/byteorder.cc \
libmemcached/callback.cc \
libmemcached/behavior.cc \
libmemcached/byteorder.cc \
libmemcached/callback.cc \
@@
-104,7
+122,7
@@
libmemcached_libmemcached_la_SOURCES+= \
libmemcached/do.cc \
libmemcached/dump.cc \
libmemcached/error.cc \
libmemcached/do.cc \
libmemcached/dump.cc \
libmemcached/error.cc \
- libmemcached/fetch.c \
+ libmemcached/fetch.c
c
\
libmemcached/flush.cc \
libmemcached/flush_buffers.cc \
libmemcached/get.cc \
libmemcached/flush.cc \
libmemcached/flush_buffers.cc \
libmemcached/get.cc \
@@
-116,7
+134,7
@@
libmemcached_libmemcached_la_SOURCES+= \
libmemcached/memcached.cc \
libmemcached/options.cc \
libmemcached/parse.cc \
libmemcached/memcached.cc \
libmemcached/options.cc \
libmemcached/parse.cc \
- libmemcached/
prefix_key
.cc \
+ libmemcached/
namespace
.cc \
libmemcached/purge.cc \
libmemcached/quit.cc \
libmemcached/response.cc \
libmemcached/purge.cc \
libmemcached/quit.cc \
libmemcached/response.cc \