X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=b0d0731938c4d670e4c2836e65866e95ce29085c;hb=3dee67d04099cc5e2986ed94aa612f429f54d6fb;hp=c348cb3d14484b4349729c445d140e55e7d95e9d;hpb=e17d20233058cc5a918c134669df0e81ee56640e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index c348cb3d..b0d07319 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -2,6 +2,10 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+libmemcached_libmemcached_la_SOURCES =
+
+include libmemcached/options/include.am
+
 EXTRA_DIST+= \
 	     libmemcached/configure.h.in \
 	     libmemcached/libmemcached_probes.d \
@@ -13,6 +17,7 @@ noinst_HEADERS+= \
 		 libmemcached/do.h \
 		 libmemcached/internal.h \
 		 libmemcached/io.h \
+		 libmemcached/is.h \
 		 libmemcached/libmemcached_probes.h \
 		 libmemcached/protocol/ascii_handler.h \
 		 libmemcached/protocol/binary_handler.h \
@@ -22,6 +27,7 @@ noinst_HEADERS+= \
 nobase_include_HEADERS+= \
 			 libmemcached/allocators.h \
 			 libmemcached/analyze.h \
+			 libmemcached/array.h \
 			 libmemcached/auto.h \
 			 libmemcached/behavior.h \
 			 libmemcached/callback.h \
@@ -29,6 +35,7 @@ nobase_include_HEADERS+= \
 			 libmemcached/constants.h \
 			 libmemcached/delete.h \
 			 libmemcached/dump.h \
+			 libmemcached/error.h \
 			 libmemcached/exception.hpp \
 			 libmemcached/fetch.h \
 			 libmemcached/flush.h \
@@ -38,6 +45,7 @@ nobase_include_HEADERS+= \
 			 libmemcached/memcached.h \
 			 libmemcached/memcached.hpp \
 			 libmemcached/memcached/protocol_binary.h \
+			 libmemcached/options.h \
 			 libmemcached/parse.h \
                          libmemcached/platform.h \
 			 libmemcached/protocol/cache.h \
@@ -84,15 +92,17 @@ libmemcached_libmemcachedinternal_la_SOURCES= \
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libmemcached_libmemcached_la_SOURCES = \
+libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/allocators.c \
 				       libmemcached/analyze.c \
+				       libmemcached/array.c \
 				       libmemcached/auto.c \
 				       libmemcached/behavior.c \
 				       libmemcached/connect.c \
 				       libmemcached/delete.c \
 				       libmemcached/do.c \
 				       libmemcached/dump.c \
+				       libmemcached/error.c \
 				       libmemcached/fetch.c \
 				       libmemcached/flush.c \
 				       libmemcached/flush_buffers.c \
@@ -102,6 +112,7 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/io.c \
 				       libmemcached/key.c \
 				       libmemcached/memcached.c \
+				       libmemcached/options.cc \
 				       libmemcached/parse.c \
 				       libmemcached/purge.c \
 				       libmemcached/quit.c \
@@ -115,6 +126,8 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/verbosity.c \
 				       libmemcached/version.c
 
+libmemcached/options.cc: libmemcached/options/parser.h
+
 
 libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
 libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
@@ -149,7 +162,7 @@ libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
 endif
 
 if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
 libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
 endif
 
@@ -161,6 +174,7 @@ endif
 if DTRACE_NEEDS_OBJECTS
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
 CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
@@ -172,5 +186,5 @@ libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
 libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
 .d.o:
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`
+	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`