X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=7dcc4d9c5ebfcd88042e3f4219111730ee47988a;hb=3dcd41c50068eec906a1a11a178e9b3f08ef2326;hp=3097fdd0c0b5ca538fa572a812bc6bf4f1824aaf;hpb=54b757ae099fb3db5132bd8a84b99a9a85492af1;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 3097fdd0..7dcc4d9c 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -7,16 +7,21 @@ libmemcached_libmemcached_la_SOURCES =
 include libmemcached/csl/include.am
 
 EXTRA_DIST+= \
-	     libmemcached/configure.h.in \
 	     libmemcached/libmemcached_probes.d \
 	     libmemcached/memcached/README.txt
 
+nobase_include_HEADERS+= \
+			 libmemcached/memcached.h \
+			 libmemcached/memcached.hpp \
+			 libmemcached/util.h
+
 noinst_HEADERS+= \
 		 libmemcached/array.h \
 		 libmemcached/assert.hpp \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
+		 libmemcached/connect.hpp \
 		 libmemcached/continuum.hpp \
 		 libmemcached/do.hpp \
 		 libmemcached/error.hpp \
@@ -32,14 +37,13 @@ noinst_HEADERS+= \
 		 libmemcached/memory.h \
 		 libmemcached/namespace.h \
 		 libmemcached/options.hpp \
-		 libmemcached/protocol/ascii_handler.h \
-		 libmemcached/protocol/binary_handler.h \
-		 libmemcached/protocol/cache.h \
-		 libmemcached/protocol/common.h \
 		 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
 
@@ -51,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 \
@@ -69,26 +75,32 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/flush_buffers.cc \
 				       libmemcached/get.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
@@ -96,16 +108,14 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
-if TARGET_LINUX
-libmemcached_libmemcached_la_LIBADD+= -lm
-endif
+libmemcached_libmemcached_la_LDFLAGS=
 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
@@ -123,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