X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2FMakefile.am;h=69265073c00f21780815b0e4db7d420b25819ea5;hb=0d2a649b7ee8410e07f649d72266f76ea43a858e;hp=5763c06ce65884f93af7325f3df228e4ce3172a8;hpb=a91a68a7c685f82bc6f46c09fa2036e44a82e7f7;p=m6w6%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 5763c06c..69265073 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,9 +1,8 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
+             memcached_configure.h.in
 
 BUILT_SOURCES= @DTRACE_HEADER@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
 EXTRA_HEADERS = 
 DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
@@ -11,11 +10,13 @@ DTRACEFLAGS =           @DTRACEFLAGS@
 noinst_HEADERS = libmemcached_probes.h \
                  libmemcached_config.h \
 		 memcached_io.h \
+                 memcached_internal.h \
                  common.h \
                  memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
 		    memcached.hh \
+                    memcached_configure.h \
 		    memcached_constants.h \
 		    memcached_get.h \
 		    memcached_result.h \
@@ -31,6 +32,7 @@ endif
 
 lib_LTLIBRARIES = libmemcached.la
 
+libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
 libmemcached_la_SOURCES = crc.c \
 			  memcached.c \
 			  memcached_auto.c \
@@ -40,6 +42,7 @@ libmemcached_la_SOURCES = crc.c \
 			  memcached_connect.c \
 			  memcached_delete.c \
 			  memcached_do.c \
+			  memcached_dump.c \
 			  memcached_fetch.c \
 			  memcached_flush.c \
 			  memcached_get.c \
@@ -62,7 +65,8 @@ libmemcached_la_SOURCES = crc.c \
 			  memcached_verbosity.c \
 			  memcached_version.c \
 			  murmur_hash.c \
-			  jenkins_hash.c
+			  jenkins_hash.c \
+                          memcached_allocators.c
 
 if INCLUDE_HSIEH_SRC
 libmemcached_la_SOURCES += hsieh_hash.c
@@ -74,8 +78,8 @@ endif
 
 DEFS += -DMEMCACHED_INTERNAL
 libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
-libmemcached_la_LIBADD = @DTRACE_OBJ@
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LIBM)
+libmemcached_la_LIBADD = @DTRACE_OBJ@ $(LIBM)
+libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
 
 dtrace_probes.h: libmemcached_probes.d
 	$(DTRACE) $(DTRACEFLAGS) -o dtrace_probes.tmp -h -s libmemcached_probes.d