projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update to latest bootstra.
[m6w6/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 5ca9c27ca4aa38c36eadb2f5ad4886f9ac15f1f5..0aabc2487c6f254f49ad5f70c24076fb7d7bb030 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-50,6
+50,7
@@
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
EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
lib_LTLIBRARIES+= libmemcached/libmemcached.la
EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
@@
-58,6
+59,13
@@
libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
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