Fix some compile time issues.

[m6w6/libmemcached] / libmemcachedprotocol / include.am

diff --git a/libmemcachedprotocol/include.am b/libmemcachedprotocol/include.am
index 58aed623339ff0ecd0fc66fd541012d94208e025..dd350f5ad3ccee7ed0d61cb4a71eaa9519af25e3 100644 (file)
--- a/libmemcachedprotocol/include.am
+++ b/libmemcachedprotocol/include.am
@@ -5,31 +5,32 @@
 
 lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
 
-noinst_HEADERS+= \
-                libmemcachedprotocol/ascii_handler.h \
-                libmemcachedprotocol/binary_handler.h \
-                libmemcachedprotocol/cache.h \
-                libmemcachedprotocol/common.h
+noinst_HEADERS+= libmemcachedprotocol/ascii_handler.h 
+noinst_HEADERS+= libmemcachedprotocol/binary_handler.h 
+noinst_HEADERS+= libmemcachedprotocol/cache.h 
+noinst_HEADERS+= libmemcachedprotocol/common.h
 
-libmemcached_libmemcachedprotocol_la_SOURCES=  \
-                                              libmemcached/byteorder.cc \
-                                              libmemcachedprotocol/ascii_handler.c \
-                                              libmemcachedprotocol/binary_handler.c \
-                                              libmemcachedprotocol/cache.c \
-                                              libmemcachedprotocol/handler.c \
-                                              libmemcachedprotocol/pedantic.c
+libmemcached_libmemcachedprotocol_la_SOURCES=
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcached/byteorder.cc 
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/ascii_handler.c 
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/binary_handler.c 
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/cache.c 
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/handler.c 
+libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/pedantic.c
 
-libmemcached_libmemcachedprotocol_la_CFLAGS= \
-                                            ${AM_CFLAGS} \
-                                            ${NO_CONVERSION} \
-                                            -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CFLAGS=
+libmemcached_libmemcachedprotocol_la_CFLAGS+= ${AM_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CFLAGS+= ${NO_CONVERSION}
+libmemcached_libmemcachedprotocol_la_CFLAGS+= -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcachedprotocol_la_CFLAGS+= @PTHREAD_CFLAGS@
 
-libmemcached_libmemcachedprotocol_la_CXXFLAGS= \
-                                              ${AM_CXXFLAGS} \
-                                              -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CXXFLAGS=
+libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${AM_CXXFLAGS}
+libmemcached_libmemcachedprotocol_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcachedprotocol_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 
-libmemcached_libmemcachedprotocol_la_LIBADD= ${PTHREAD_LIBS}
+libmemcached_libmemcachedprotocol_la_LIBADD=
+libmemcached_libmemcachedprotocol_la_LIBADD+= @LIBEVENT_LDFLAGS@
+libmemcached_libmemcachedprotocol_la_LIBADD+= @PTHREAD_LIBS@
 libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS}
 libmemcached_libmemcachedprotocol_la_LDFLAGS+= -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}