projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for release.
[awesomized/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 2465b058c228ade522f9962458b03e7efea255f6..0aabc2487c6f254f49ad5f70c24076fb7d7bb030 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-26,7
+26,6
@@
noinst_HEADERS+= libmemcached/encoding_key.h
noinst_HEADERS+= libmemcached/error.hpp
noinst_HEADERS+= libmemcached/flag.hpp
noinst_HEADERS+= libmemcached/initialize_query.h
noinst_HEADERS+= libmemcached/error.hpp
noinst_HEADERS+= libmemcached/flag.hpp
noinst_HEADERS+= libmemcached/initialize_query.h
-noinst_HEADERS+= libmemcached/instance.h
noinst_HEADERS+= libmemcached/instance.hpp
noinst_HEADERS+= libmemcached/internal.h
noinst_HEADERS+= libmemcached/io.h
noinst_HEADERS+= libmemcached/instance.hpp
noinst_HEADERS+= libmemcached/internal.h
noinst_HEADERS+= libmemcached/io.h
@@
-39,6
+38,7
@@
noinst_HEADERS+= libmemcached/memcached/vbucket.h
noinst_HEADERS+= libmemcached/memory.h
noinst_HEADERS+= libmemcached/namespace.h
noinst_HEADERS+= libmemcached/options.hpp
noinst_HEADERS+= libmemcached/memory.h
noinst_HEADERS+= libmemcached/namespace.h
noinst_HEADERS+= libmemcached/options.hpp
+noinst_HEADERS+= libmemcached/poll.h
noinst_HEADERS+= libmemcached/response.h
noinst_HEADERS+= libmemcached/result.h
noinst_HEADERS+= libmemcached/sasl.hpp
noinst_HEADERS+= libmemcached/response.h
noinst_HEADERS+= libmemcached/result.h
noinst_HEADERS+= libmemcached/sasl.hpp
@@
-50,14
+50,22
@@
noinst_HEADERS+= libmemcached/udp.hpp
noinst_HEADERS+= libmemcached/version.hpp
noinst_HEADERS+= libmemcached/virtual_bucket.h
noinst_HEADERS+= libmemcached/watchpoint.h
noinst_HEADERS+= libmemcached/version.hpp
noinst_HEADERS+= libmemcached/virtual_bucket.h
noinst_HEADERS+= libmemcached/watchpoint.h
+noinst_HEADERS+= libmemcached/windows.hpp
lib_LTLIBRARIES+= libmemcached/libmemcached.la
lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_DEPENDENCIES=
+
EXTRA_
libmemcached_libmemcached_la_DEPENDENCIES=
libmemcached_libmemcached_la_LIBADD=
libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_LIBADD=
libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
+if BUILD_WIN32
+libmemcached_libmemcached_la_CFLAGS+= -DBUILDING_HASHKIT
+libmemcached_libmemcached_la_CXXFLAGS+= -DBUILDING_HASHKIT
+libmemcached_libmemcached_la_LIBADD+= -lmingw32
+libmemcached_libmemcached_la_LIBADD+= -lws2_32
+endif
+
libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc
libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES}
libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc
libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES}
libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc
@@
-91,6
+99,7
@@
libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/poll.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
@@
-105,9
+114,9
@@
libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc
-libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c
libmemcached/options.cc: libmemcached/csl/parser.h
libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c
libmemcached/options.cc: libmemcached/csl/parser.h
@@
-118,7
+127,7
@@
libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
if HAVE_SASL
libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
if HAVE_SASL
libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
-libmemcached_libmemcached_la_LIBADD+= @SASL_LIB@
+libmemcached_libmemcached_la_LIBADD+= @
LIB
SASL_LIB@
endif
if HAVE_DTRACE
endif
if HAVE_DTRACE
@@
-126,7
+135,7
@@
BUILT_SOURCES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/libmemcached_probes.o
CLEANFILES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/libmemcached_probes.o
-libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+
EXTRA_
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
libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
endif