X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=1eccc3695f3bad09cd86fe35fa4f2ec64c37b694;hb=dfdbdc9f6d1b22eb717c8a77095dd617725022fe;hp=13304e62ad5ad3497e842b17b518ac011730da72;hpb=2e52a0a4fe2f17ea724a97409047874c341317ab;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 13304e62..1eccc369 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -2,7 +2,7 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-libmemcached_libmemcached_la_SOURCES =
+libmemcached_libmemcached_la_SOURCES=
 
 include libmemcached/csl/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/instance.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/poll.h
 noinst_HEADERS+= libmemcached/response.h 
 noinst_HEADERS+= libmemcached/result.h
 noinst_HEADERS+= libmemcached/sasl.hpp 
@@ -50,11 +50,24 @@ noinst_HEADERS+= libmemcached/udp.hpp
 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
-libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
+libmemcached_libmemcached_la_LIBADD=
+libmemcached_libmemcached_la_LDFLAGS=
+libmemcached_libmemcached_la_CFLAGS=
+libmemcached_libmemcached_la_CXXFLAGS=
 
-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}
@@ -89,6 +102,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/poll.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
@@ -103,25 +117,21 @@ 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/udp.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_DEPENDENCIES=
-libmemcached_libmemcached_la_LIBADD=
-libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
-libmemcached_libmemcached_la_LDFLAGS+= $(DL_LIB)
+libmemcached_libmemcached_la_LIBADD+= @lt_cv_dlopen_libs@
 
 if HAVE_SASL
-libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
-libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
-libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
-libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
+libmemcached_libmemcached_la_CFLAGS+= @PTHREAD_CFLAGS@
+libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
+libmemcached_libmemcached_la_LIBADD+= @SASL_LIB@
 endif
 
 if HAVE_DTRACE
@@ -129,7 +139,7 @@ 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