X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2FMakefile.am;h=d942704004ab5a09ce46b85016e7bc854075a2ef;hb=0746a4c95a439cba0be5fb3e5fd1e75fdb6dd05c;hp=9b1f00c82ac19c6a8769bcfab49baebba79e1c65;hpb=522a9124f1b0ec147d791abfbf8bdafe61681e91;p=m6w6%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 9b1f00c8..d9427040 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,22 +1,21 @@
-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)
-LIBS = @LIBS@
-
 EXTRA_HEADERS = 
 DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
 
 noinst_HEADERS = libmemcached_probes.h \
-		 memcached_io.h \
+                 memcached_io.h \
+                 memcached_internal.h \
                  common.h \
                  memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
 		    memcached.hh \
-		    libmemcached_config.h \
+                    memcached_configure.h \
 		    memcached_constants.h \
 		    memcached_get.h \
 		    memcached_result.h \
@@ -24,20 +23,28 @@ pkginclude_HEADERS= memcached.h \
 		    memcached_storage.h \
 		    memcached_string.h \
 		    memcached_types.h \
-		    memcached_watchpoint.h
+		    memcached_watchpoint.h \
+		    visibility.h
+
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h memcached_pool.h
+endif
 
 lib_LTLIBRARIES = libmemcached.la
+noinst_LTLIBRARIES = libmemcachedcallbacks.la
+libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
+libmemcachedcallbacks_la_SOURCES = memcached_callback.c
 
+libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBMEMCACHED
 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_dump.c \
 			  memcached_fetch.c \
 			  memcached_flush.c \
 			  memcached_get.c \
@@ -60,16 +67,20 @@ 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
+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)
+libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@ libmemcachedcallbacks.la
+libmemcached_la_LIBADD = @DTRACE_OBJ@ $(LIBM) libmemcachedcallbacks.la
+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