Setup for next version (and fixes for util for RPM)

[awesomized/libmemcached] / libmemcached / Makefile.am

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 78c2c9a195ab9fb22bf1e2fd5528a987b2824bed..772564cd752f14259926a38e921b218f45d8c93f 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -10,13 +10,13 @@ DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
 
 noinst_HEADERS = libmemcached_probes.h \
+                 libmemcached_config.h \
                 memcached_io.h \
                  common.h \
                  memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
                    memcached.hh \
-                   libmemcached_config.h \
                    memcached_constants.h \
                    memcached_get.h \
                    memcached_result.h \
@@ -26,25 +26,29 @@ pkginclude_HEADERS= memcached.h \
                    memcached_types.h \
                    memcached_watchpoint.h
 
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h memcached_pool.h
+endif
+
 lib_LTLIBRARIES = libmemcached.la
 
 libmemcached_la_SOURCES = crc.c \
-                         hsieh_hash.c \
                          memcached.c \
                          memcached_auto.c \
+                         memcached_analyze.c \
                          memcached_behavior.c \
                          memcached_callback.c \
                          memcached_connect.c \
                          memcached_delete.c \
                          memcached_do.c \
                          memcached_fetch.c \
-                         memcached_fetch_execute.c \
                          memcached_flush.c \
                          memcached_get.c \
                          memcached_hash.c \
                          memcached_hosts.c \
                          memcached_io.c \
                          memcached_purge.c \
+                          memcached_flush_buffers.c \
                          md5.c \
                          memcached_key.c \
                          memcached_quit.c \
@@ -55,13 +59,21 @@ libmemcached_la_SOURCES = crc.c \
                          memcached_storage.c \
                          memcached_string.c \
                          memcached_stats.c \
-                          memcached_strerror.c \
+                         memcached_strerror.c \
                          memcached_verbosity.c \
                          memcached_version.c \
                          murmur_hash.c \
-                         jenkins_hash.c \
-                          byteorder.c
+                         jenkins_hash.c
+
+if INCLUDE_HSIEH_SRC
+libmemcached_la_SOURCES += hsieh_hash.c
+endif
+
+if BUILD_BYTEORDER
+libmemcached_la_SOURCES += byteorder.c
+endif
 
+AM_CFLAGS = -DMEMCACHED_INTERNAL
 libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
 libmemcached_la_LIBADD = @DTRACE_OBJ@
 libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)