X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=035725a30b559568a3a04f3d4cdca75ae83c18ea;hb=b048aacba5d279f3271163cfaa0704684beca1e2;hp=dc125bd70680aa35f06b3321e292f1d24bcee5d9;hpb=26c65ac524f21cd73a79f3caf45cdb76c9a41bc0;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index dc125bd7..035725a3 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -2,6 +2,10 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+libmemcached_libmemcached_la_SOURCES =
+
+include libmemcached/options/include.am
+
 EXTRA_DIST+= \
 	     libmemcached/configure.h.in \
 	     libmemcached/libmemcached_probes.d \
@@ -13,15 +17,18 @@ noinst_HEADERS+= \
 		 libmemcached/do.h \
 		 libmemcached/internal.h \
 		 libmemcached/io.h \
+		 libmemcached/is.h \
 		 libmemcached/libmemcached_probes.h \
 		 libmemcached/protocol/ascii_handler.h \
 		 libmemcached/protocol/binary_handler.h \
 		 libmemcached/protocol/common.h \
-		 libmemcached/response.h
+		 libmemcached/response.h \
+		 libmemcached/virtual_bucket.h
 
 nobase_include_HEADERS+= \
 			 libmemcached/allocators.h \
 			 libmemcached/analyze.h \
+			 libmemcached/array.h \
 			 libmemcached/auto.h \
 			 libmemcached/behavior.h \
 			 libmemcached/callback.h \
@@ -29,20 +36,26 @@ nobase_include_HEADERS+= \
 			 libmemcached/constants.h \
 			 libmemcached/delete.h \
 			 libmemcached/dump.h \
+			 libmemcached/error.h \
 			 libmemcached/exception.hpp \
 			 libmemcached/fetch.h \
 			 libmemcached/flush.h \
 			 libmemcached/flush_buffers.h \
 			 libmemcached/get.h \
 			 libmemcached/hash.h \
+			 libmemcached/initialize_query.h \
 			 libmemcached/memcached.h \
 			 libmemcached/memcached.hpp \
 			 libmemcached/memcached/protocol_binary.h \
+			 libmemcached/memcached/vbucket.h \
+			 libmemcached/options.h \
 			 libmemcached/parse.h \
+			 libmemcached/prefix_key.h \
 			 libmemcached/protocol/cache.h \
 			 libmemcached/protocol/callback.h \
 			 libmemcached/protocol_handler.h \
 			 libmemcached/quit.h \
+                         libmemcached/platform.h \
 			 libmemcached/result.h \
                          libmemcached/sasl.h \
 			 libmemcached/server.h \
@@ -65,7 +78,8 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
 						libmemcached/protocol/pedantic.c \
 						libmemcached/protocol/protocol_handler.c
 
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedprotocol_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
 
 noinst_LTLIBRARIES+= \
 		     libmemcached/libmemcachedcallbacks.la
@@ -78,13 +92,15 @@ libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
 # These symbols will not be exposed in the shipped .so
 noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
 libmemcached_libmemcachedinternal_la_SOURCES= \
+					      libmemcached/error.c \
 					      libmemcached/string.c
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libmemcached_libmemcached_la_SOURCES = \
+libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/allocators.c \
 				       libmemcached/analyze.c \
+				       libmemcached/array.c \
 				       libmemcached/auto.c \
 				       libmemcached/behavior.c \
 				       libmemcached/connect.c \
@@ -97,10 +113,13 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/get.c \
 				       libmemcached/hash.c \
 				       libmemcached/hosts.c \
+				       libmemcached/initialize_query.cc \
 				       libmemcached/io.c \
 				       libmemcached/key.c \
 				       libmemcached/memcached.c \
+				       libmemcached/options.cc \
 				       libmemcached/parse.c \
+				       libmemcached/prefix_key.cc \
 				       libmemcached/purge.c \
 				       libmemcached/quit.c \
 				       libmemcached/response.c \
@@ -111,7 +130,10 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/storage.c \
 				       libmemcached/strerror.c \
 				       libmemcached/verbosity.c \
-				       libmemcached/version.c
+				       libmemcached/version.c \
+				       libmemcached/virtual_bucket.c
+
+libmemcached/options.cc: libmemcached/options/parser.h
 
 
 libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
@@ -121,13 +143,20 @@ libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LI
 if BUILD_LIBMEMCACHEDUTIL
 nobase_include_HEADERS+= \
 			 libmemcached/memcached_util.h \
-			 libmemcached/util/pool.h
+			 libmemcached/util.h \
+			 libmemcached/util/ping.h \
+			 libmemcached/util/pool.h \
+			 libmemcached/util/version.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 
-libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
+libmemcached_libmemcachedutil_la_SOURCES= \
+					  libmemcached/util/ping.c \
+					  libmemcached/util/pool.c \
+					  libmemcached/util/version.c
+libmemcached_libmemcachedutil_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
 
 if BUILD_BYTEORDER
@@ -140,25 +169,29 @@ libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
 endif
 
 if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
 libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
 endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
+CLEANFILES+= libmemcached/dtrace_probes.h
 endif
 
 if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
+CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
 SUFFIXES+= .d
 
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s libmemcached/libmemcached_probes.d
+	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
+
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d $(libmemcached_libmemcached_la_OBJECTS)
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+.d.o:
+	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`