Merge in code changes for all of the new parser.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index e318f7edfd6eb16f37753f017d4b3998f72a1af2..b0d0731938c4d670e4c2836e65866e95ce29085c 100644 (file)
--- 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