X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2FMakefile.am;h=d942704004ab5a09ce46b85016e7bc854075a2ef;hb=0746a4c95a439cba0be5fb3e5fd1e75fdb6dd05c;hp=98edb8bbc44a4adaaed52158301261b1ec1234df;hpb=34fc4157bda6f458cc603cf32c93507dab9c4f8a;p=m6w6%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 98edb8bb..d9427040 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -8,14 +8,14 @@ DTRACE =                @DTRACE@
 DTRACEFLAGS =           @DTRACEFLAGS@
 
 noinst_HEADERS = libmemcached_probes.h \
-                 libmemcached_config.h \
-		 memcached_io.h \
+                 memcached_io.h \
                  memcached_internal.h \
                  common.h \
                  memcached/protocol_binary.h @DTRACE_HEADER@
 
 pkginclude_HEADERS= memcached.h \
 		    memcached.hh \
+                    memcached_configure.h \
 		    memcached_constants.h \
 		    memcached_get.h \
 		    memcached_result.h \
@@ -23,21 +23,24 @@ pkginclude_HEADERS= memcached.h \
 		    memcached_storage.h \
 		    memcached_string.h \
 		    memcached_types.h \
-		    memcached_watchpoint.h
+		    memcached_watchpoint.h \
+		    visibility.h
 
 if BUILD_LIBMEMCACHEDUTIL
 pkginclude_HEADERS+= memcached_util.h memcached_pool.h
 endif
 
 lib_LTLIBRARIES = libmemcached.la
+noinst_LTLIBRARIES = libmemcachedcallbacks.la
+libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
+libmemcachedcallbacks_la_SOURCES = memcached_callback.c
 
-libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBMEMCACHED
 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 \
@@ -75,9 +78,8 @@ if BUILD_BYTEORDER
 libmemcached_la_SOURCES += byteorder.c
 endif
 
-DEFS += -DMEMCACHED_INTERNAL
-libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
-libmemcached_la_LIBADD = @DTRACE_OBJ@ $(LIBM)
+libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@ libmemcachedcallbacks.la
+libmemcached_la_LIBADD = @DTRACE_OBJ@ $(LIBM) libmemcachedcallbacks.la
 libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
 
 dtrace_probes.h: libmemcached_probes.d