Cleans up the assert and some other things that Fedora 15 found.

[awesomized/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 28c5513a4cbc7742ff856176ec720b27ea7cdc90..db612892245d430561b369b43b978547048741e8 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -12,14 +12,18 @@ EXTRA_DIST+= \
             libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
+                libmemcached/assert.hpp \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
-                libmemcached/do.h \
+                libmemcached/do.hpp \
+                libmemcached/error.hpp \
                 libmemcached/initialize_query.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
                 libmemcached/is.h \
                 libmemcached/libmemcached_probes.h \
+                libmemcached/memory.h \
+                libmemcached/options.hpp \
                 libmemcached/protocol/ascii_handler.h \
                 libmemcached/protocol/binary_handler.h \
                 libmemcached/protocol/common.h \
@@ -31,6 +35,7 @@ nobase_include_HEADERS+= \
                         libmemcached/analyze.h \
                         libmemcached/array.h \
                         libmemcached/auto.h \
+                        libmemcached/basic_string.h \
                         libmemcached/behavior.h \
                         libmemcached/callback.h \
                         libmemcached/configure.h \
@@ -50,7 +55,7 @@ nobase_include_HEADERS+= \
                         libmemcached/memcached/vbucket.h \
                         libmemcached/options.h \
                         libmemcached/parse.h \
-                        libmemcached/prefix_key.h \
+                        libmemcached/namespace.h \
                         libmemcached/protocol/cache.h \
                         libmemcached/protocol/callback.h \
                         libmemcached/protocol_handler.h \
@@ -76,8 +81,18 @@ nobase_include_HEADERS+= \
 # These symbols will not be exposed in the shipped .so
 noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
 libmemcached_libmemcachedinternal_la_SOURCES= \
+                                             libmemcached/array.c \
                                              libmemcached/error.cc \
                                              libmemcached/string.cc
+libmemcached_libmemcachedinternal_la_CFLAGS= \
+                                    ${AM_CFLAGS} \
+                                    ${NO_CONVERSION} \
+                                    -DBUILDING_LIBMEMCACHED
+
+libmemcached_libmemcachedinternal_la_CXXFLAGS= \
+                                      ${AM_CXXFLAGS} \
+                                      ${NO_CONVERSION} \
+                                      -DBUILDING_LIBMEMCACHED
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= \
@@ -104,7 +119,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/do.cc \
                                       libmemcached/dump.cc \
                                       libmemcached/error.cc \
-                                      libmemcached/fetch.c \
+                                      libmemcached/fetch.cc \
                                       libmemcached/flush.cc \
                                       libmemcached/flush_buffers.cc \
                                       libmemcached/get.cc \
@@ -116,7 +131,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/memcached.cc \
                                       libmemcached/options.cc \
                                       libmemcached/parse.cc \
-                                      libmemcached/prefix_key.cc \
+                                      libmemcached/namespace.cc \
                                       libmemcached/purge.cc \
                                       libmemcached/quit.cc \
                                       libmemcached/response.cc \