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 06480a5dad95e28973c9a5e29c2e3836f1b4ccc5..772564cd752f14259926a38e921b218f45d8c93f 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,57 +1,54 @@
-EXTRA_DIST = libmemcached_probes.d
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt
+
+BUILT_SOURCES= @DTRACE_HEADER@
 
 INCLUDES = -I$(top_builddir)
-LIBS =
+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
+                 common.h \
+                 memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
                    memcached.hh \
-                   libmemcached_config.h \
-                   memcached_constants.h \ 
+                   memcached_constants.h \
+                   memcached_get.h \
                    memcached_result.h \
                    memcached_server.h \
+                   memcached_storage.h \
                    memcached_string.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 \
@@ -62,23 +59,37 @@ 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
+                         murmur_hash.c \
+                         jenkins_hash.c
 
-libmemcached_la_LIBADD =
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)
+if INCLUDE_HSIEH_SRC
+libmemcached_la_SOURCES += hsieh_hash.c
+endif
 
-if HAVE_DTRACE
-  libmemcached_la_LIBADD += libmemcached_probes.o
+if BUILD_BYTEORDER
+libmemcached_la_SOURCES += byteorder.c
 endif
 
-libmemcached_probes.h: libmemcached_probes.d
-       $(DTRACE) $(DTRACEFLAGS) -h -s libmemcached_probes.d
-       mv libmemcached_probes.h libmemcached_probes.h.bak
-       sed "s/#include <unistd.h>//g" libmemcached_probes.h.bak > libmemcached_probes.h
-       rm libmemcached_probes.h.bak
+AM_CFLAGS = -DMEMCACHED_INTERNAL
+libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
+libmemcached_la_LIBADD = @DTRACE_OBJ@
+libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)
+
+dtrace_probes.h: libmemcached_probes.d
+       $(DTRACE) $(DTRACEFLAGS) -o dtrace_probes.tmp -h -s libmemcached_probes.d
+       sed "s/#include <unistd.h>//g" dtrace_probes.tmp > dtrace_probes.h
+       rm dtrace_probes.tmp
+
+
+# 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.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`
+       $(DTRACE) $(DTRACEFLAGS) -o libmemcached_probes.o -G -s libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
 
-libmemcached_probes.o:
-       $(DTRACE) $(DTRACEFLAGS) -G -s libmemcached_probes.d $(DTRACEFILES)