projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Harmonize WIN32, and update bootstrap
[m6w6/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 6dbcb167c3460980035a271d3499ea0096752019..9eb1942c9ab75ddb8a6217cb394ebce1a8305f2e 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-38,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
@@
-51,12
+52,19
@@
noinst_HEADERS+= libmemcached/virtual_bucket.h
noinst_HEADERS+= libmemcached/watchpoint.h
lib_LTLIBRARIES+= libmemcached/libmemcached.la
noinst_HEADERS+= libmemcached/watchpoint.h
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
@@
-90,6
+98,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
@@
-104,9
+113,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
@@
-115,19
+124,17
@@
libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION
libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
if HAVE_SASL
libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
if HAVE_SASL
-if HAVE_LIBSASL
libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
endif
libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
endif
-endif
if HAVE_DTRACE
BUILT_SOURCES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/libmemcached_probes.o
if HAVE_DTRACE
BUILT_SOURCES+= libmemcached/dtrace_probes.h
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