minor tweaks to udp testcode and new error string

[awesomized/libmemcached] / libmemcached / Makefile.am

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 7e117b94a5a6704d9cd459db1d82c1ce05375198..bcb3cd65cceade57a20658a01beb10d41804a152 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -5,27 +5,14 @@ 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 \
                 memcached_io.h \
                  common.h \
-                 memcached/protocol_binary.h
+                 memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
                    memcached.hh \
@@ -45,6 +32,7 @@ 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 \
@@ -58,6 +46,7 @@ libmemcached_la_SOURCES = crc.c \
                          memcached_hosts.c \
                          memcached_io.c \
                          memcached_purge.c \
+                          memcached_flush_buffers.c \
                          md5.c \
                          memcached_key.c \
                          memcached_quit.c \
@@ -68,7 +57,7 @@ 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 \
@@ -88,8 +77,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`