Merge, better error messages

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 69385463598c36e7ff988a7b06c23f6ba2712f14..7dcc4d9c5ebfcd88042e3f4219111730ee47988a 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -20,7 +20,6 @@ noinst_HEADERS+= \
                 libmemcached/assert.hpp \
                 libmemcached/backtrace.hpp \
                 libmemcached/byteorder.h \
-                libmemcached/close_socket.hpp \
                 libmemcached/common.h \
                 libmemcached/connect.hpp \
                 libmemcached/continuum.hpp \
@@ -39,9 +38,12 @@ noinst_HEADERS+= \
                 libmemcached/namespace.h \
                 libmemcached/options.hpp \
                 libmemcached/response.h \
+                libmemcached/sasl.hpp \
                 libmemcached/server.hpp \
                 libmemcached/server_instance.h \
+                libmemcached/socket.hpp \
                 libmemcached/string.hpp \
+                libmemcached/udp.hpp \
                 libmemcached/virtual_bucket.h \
                 libmemcached/watchpoint.h
 
@@ -53,11 +55,13 @@ libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 libmemcached_libmemcached_la_SOURCES+= \
                                       ${libhashkit_libhashkit_la_SOURCES} \
                                       libmemcached/allocators.cc \
+                                      libmemcached/allocators.hpp \
                                       libmemcached/analyze.cc \
                                       libmemcached/array.c \
                                       libmemcached/auto.cc \
                                       libmemcached/backtrace.cc \
                                       libmemcached/behavior.cc \
+                                      libmemcached/behavior.hpp \
                                       libmemcached/byteorder.cc \
                                       libmemcached/callback.cc \
                                       libmemcached/connect.cc \
@@ -70,28 +74,33 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/flush.cc \
                                       libmemcached/flush_buffers.cc \
                                       libmemcached/get.cc \
-                                      libmemcached/touch.cc \
                                       libmemcached/hash.cc \
+                                      libmemcached/hash.hpp \
                                       libmemcached/hosts.cc \
                                       libmemcached/initialize_query.cc \
                                       libmemcached/io.cc \
                                       libmemcached/key.cc \
                                       libmemcached/memcached.cc \
+                                      libmemcached/namespace.cc \
                                       libmemcached/options.cc \
                                       libmemcached/parse.cc \
-                                      libmemcached/namespace.cc \
                                       libmemcached/purge.cc \
                                       libmemcached/quit.cc \
+                                      libmemcached/quit.hpp \
                                       libmemcached/response.cc \
                                       libmemcached/result.cc \
+                                      libmemcached/sasl.cc \
                                       libmemcached/server.cc \
                                       libmemcached/server_list.cc \
+                                      libmemcached/server_list.hpp \
                                       libmemcached/stats.cc \
                                       libmemcached/storage.cc \
                                       libmemcached/strerror.cc \
                                       libmemcached/string.cc \
+                                      libmemcached/touch.cc \
                                       libmemcached/verbosity.cc \
                                       libmemcached/version.cc \
+                                      libmemcached/udp.cc \
                                       libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/csl/parser.h
@@ -100,16 +109,13 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
-if TARGET_LINUX
-libmemcached_libmemcached_la_LIBADD+= -lm
-endif
 libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
-libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
-libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
 if HAVE_SASL
-libmemcached_libmemcached_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcached_libmemcached_la_LIBADD+= ${PTHREAD_LIBS}
+libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
+libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
 endif
 
 if HAVE_DTRACE
@@ -127,7 +133,7 @@ SUFFIXES+= .d
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
        $(DTRACE) $(DTRACEFLAGS) -h -o ${top_srcdir}/libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS}
 
 .d.o:
        $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d