X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2FMakefile.am;h=772564cd752f14259926a38e921b218f45d8c93f;hb=ef0dfae9de06beccc4ba1b7008c62bbbd0e30d47;hp=7e117b94a5a6704d9cd459db1d82c1ce05375198;hpb=5ef15e8c3826baead436f0d4fe6a4889956a3124;p=awesomized%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 7e117b94..772564cd 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -5,31 +5,18 @@ BUILT_SOURCES= @DTRACE_HEADER@
 INCLUDES = -I$(top_builddir)
 LIBS = @LIBS@
 
+EXTRA_HEADERS = 
 DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
-DTRACEFILES = memcached.o \
-              memcached_strerror.o \
-              memcached_connect.o \
-              memcached_response.o \
-              memcached_get.o \
-              memcached_storage.o \
-              memcached_delete.o \
-              memcached_hash.o \
-              memcached_auto.o \
-              memcached_verbosity.o \
-              memcached_quit.o \
-              memcached_flush.o \
-              memcached_string.o \
-              memcached_stats.o
 
 noinst_HEADERS = libmemcached_probes.h \
+                 libmemcached_config.h \
 		 memcached_io.h \
                  common.h \
-                 memcached/protocol_binary.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 \
@@ -39,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 \
@@ -68,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)
@@ -88,8 +87,7 @@ dtrace_probes.h: libmemcached_probes.d
 # So libtool doesn't support dtrace, but just copy one of the existing
 # lo-file and replace the file name ;-) 
 libmemcached_probes.lo: libmemcached_probes.o
-	sed "s,jenkins_hash,libmemcached_probes,g" jenkins_hash.lo > libmemcached_probes.tmp
-	mv libmemcached_probes.tmp libmemcached_probes.lo
+	sed "s,jenkins_hash,libmemcached_probes,g" jenkins_hash.lo > libmemcached_probes.lo
 
 libmemcached_probes.o: $(libmemcached_la_OBJECTS)
 	$(DTRACE) $(DTRACEFLAGS) -o .libs/libmemcached_probes.o -G -s libmemcached_probes.d `grep pic_object *.lo | cut -f 2 -d\' | grep -v non_pic_object`