X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2FMakefile.am;h=e85fecb770ec75862185148a71fe155979d6cfde;hb=7c7750f02368b570353ea109f23a0ea26d226e02;hp=ebb31be57790ad1974af46d183f5aa20fe152346;hpb=ad1dda861388a32864c435eaa139a72bc61298f3;p=m6w6%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index ebb31be5..e85fecb7 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,93 +1,140 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver
+EXTRA_DIST = \
+	    libmemcached.ver \
+	    libmemcached_probes.d \
+	    memcached/README.txt \
+	    memcached_configure.h.in \
+	    protocol/libmemcachedprotocol.ver \
+	    util/libmemcachedutil.ver
 
-BUILT_SOURCES= @DTRACE_HEADER@
 
-EXTRA_HEADERS = 
-DTRACE =                @DTRACE@
-DTRACEFLAGS =           @DTRACEFLAGS@
+EXTRA_HEADERS =
+BUILT_SOURCES=
 
 noinst_HEADERS = libmemcached_probes.h \
-                 libmemcached_config.h \
-		 memcached_io.h \
+                 io.h \
+                 internal.h \
                  common.h \
-                 memcached/protocol_binary.h @DTRACE_HEADER@
-
-pkginclude_HEADERS= memcached.h \
-		    memcached.hh \
-		    memcached_constants.h \
-		    memcached_get.h \
-		    memcached_result.h \
-		    memcached_server.h \
-		    memcached_storage.h \
-		    memcached_string.h \
-		    memcached_types.h \
-		    memcached_watchpoint.h
+                 memcached/protocol_binary.h \
+                 protocol/common.h \
+                 protocol/ascii_handler.h \
+                 protocol/binary_handler.h
 
-if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= memcached_util.h memcached_pool.h
-endif
+pkginclude_HEADERS= \
+		    behavior.h \
+		    callback.h \
+		    constants.h \
+		    exception.hpp \
+		    get.h \
+		    memcached.h \
+		    memcached.hpp \
+		    memcached_configure.h \
+		    protocol_handler.h \
+		    result.h \
+		    server.h \
+		    storage.h \
+		    string.h \
+		    types.h \
+		    visibility.h \
+		    watchpoint.h
 
-lib_LTLIBRARIES = libmemcached.la
+nobase_pkginclude_HEADERS = \
+			    protocol/cache.h \
+			    protocol/callback.h
 
-libmemcached_la_SOURCES = crc.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 \
-			  memcached_hash.c \
-			  memcached_hosts.c \
-			  memcached_io.c \
-			  memcached_purge.c \
-                          memcached_flush_buffers.c \
+
+libmemcachedprotocol_la_SOURCES =  \
+				    protocol/ascii_handler.c \
+				    protocol/binary_handler.c \
+				    protocol/cache.c \
+				    protocol/pedantic.c \
+				    protocol/protocol_handler.c
+
+libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
+
+lib_LTLIBRARIES = libmemcached.la libmemcachedprotocol.la
+noinst_LTLIBRARIES = libmemcachedcallbacks.la
+libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
+libmemcachedcallbacks_la_SOURCES = callback.c
+
+libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+libmemcached_la_SOURCES = \
+			  allocators.c \
+			  analyze.c \
+			  auto.c \
+			  behavior.c \
+			  connect.c \
+			  crc.c \
+			  delete.c \
+			  do.c \
+			  dump.c \
+			  fetch.c \
+			  flush.c \
+			  flush_buffers.c \
+			  get.c \
+			  hash.c \
+			  hosts.c \
+			  io.c \
+			  jenkins_hash.c \
+			  key.c \
 			  md5.c \
-			  memcached_key.c \
-			  memcached_quit.c \
-			  memcached_parse.c \
-			  memcached_response.c \
-			  memcached_result.c \
-			  memcached_server.c \
-			  memcached_storage.c \
-			  memcached_string.c \
-			  memcached_stats.c \
-			  memcached_strerror.c \
-			  memcached_verbosity.c \
-			  memcached_version.c \
+			  memcached.c \
 			  murmur_hash.c \
-			  jenkins_hash.c
+			  parse.c \
+			  purge.c \
+			  quit.c \
+			  response.c \
+			  result.c \
+			  server.c \
+			  stats.c \
+			  storage.c \
+			  strerror.c \
+			  string.c \
+			  verbosity.c \
+			  version.c
+
 
 if INCLUDE_HSIEH_SRC
 libmemcached_la_SOURCES += hsieh_hash.c
 endif
 
+libmemcached_la_DEPENDENCIES= libmemcachedcallbacks.la
+libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
+libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h pool.h
+lib_LTLIBRARIES+= libmemcachedutil.la
+endif
+
+libmemcachedutil_la_SOURCES= util/pool.c
+libmemcachedutil_la_LIBADD= libmemcached.la
+libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcachedutil_la_DEPENDENCIES=libmemcached.la
+
 if BUILD_BYTEORDER
-libmemcached_la_SOURCES += byteorder.c
+noinst_LTLIBRARIES += libbyteorder.la
+libbyteorder_la_SOURCES= byteorder.c byteorder.h
+libmemcached_la_LIBADD += libbyteorder.la
+libmemcached_la_DEPENDENCIES+= libbyteorder.la
+libmemcachedprotocol_la_LIBADD=libbyteorder.la
+libmemcachedprotocol_la_DEPENDENCIES=libbyteorder.la
 endif
 
-DEFS += -DMEMCACHED_INTERNAL
-libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
-libmemcached_la_LIBADD = @DTRACE_OBJ@
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
+if HAVE_DTRACE
+BUILT_SOURCES+= dtrace_probes.h
+libmemcached_la_SOURCES += libmemcached_probes.d
+endif
 
-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
+if DTRACE_NEEDS_OBJECTS
+libmemcached_la_DEPENDENCIES += libmemcached_probes.o
+endif
 
+SUFFIXES= .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.lo
+dtrace_probes.h: libmemcached_probes.d
+	$(DTRACE) $(DTRACEFLAGS) -h -o dtrace_probes.h -s libmemcached_probes.d
 
-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`
+libmemcached_probes.o: libmemcached_probes.d $(libmemcached_la_OBJECTS)
+	$(DTRACE) $(DTRACEFLAGS) -o .libs/libmemcached_probes.o -G -s libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
 	$(DTRACE) $(DTRACEFLAGS) -o libmemcached_probes.o -G -s libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `