projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed strict aliasing. Turn it off only for the callbacks code. When we turn it
[m6w6/libmemcached]
/
libmemcached
/
Makefile.am
diff --git
a/libmemcached/Makefile.am
b/libmemcached/Makefile.am
index be314700e3e333ba0f2685cdc34051e2bc57c320..d942704004ab5a09ce46b85016e7bc854075a2ef 100644
(file)
--- a/
libmemcached/Makefile.am
+++ b/
libmemcached/Makefile.am
@@
-1,4
+1,5
@@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
+ memcached_configure.h.in
BUILT_SOURCES= @DTRACE_HEADER@
BUILT_SOURCES= @DTRACE_HEADER@
@@
-7,13
+8,14
@@
DTRACE = @DTRACE@
DTRACEFLAGS = @DTRACEFLAGS@
noinst_HEADERS = libmemcached_probes.h \
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 \
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 \
memcached_constants.h \
memcached_get.h \
memcached_result.h \
@@
-21,20
+23,24
@@
pkginclude_HEADERS= memcached.h \
memcached_storage.h \
memcached_string.h \
memcached_types.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
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} -DBUILDING_LIBMEMCACHED
libmemcached_la_SOURCES = crc.c \
memcached.c \
memcached_auto.c \
memcached_analyze.c \
memcached_behavior.c \
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_connect.c \
memcached_delete.c \
memcached_do.c \
@@
-61,7
+67,8
@@
libmemcached_la_SOURCES = crc.c \
memcached_verbosity.c \
memcached_version.c \
murmur_hash.c \
memcached_verbosity.c \
memcached_version.c \
murmur_hash.c \
- jenkins_hash.c
+ jenkins_hash.c \
+ memcached_allocators.c
if INCLUDE_HSIEH_SRC
libmemcached_la_SOURCES += hsieh_hash.c
if INCLUDE_HSIEH_SRC
libmemcached_la_SOURCES += hsieh_hash.c
@@
-71,9
+78,8
@@
if BUILD_BYTEORDER
libmemcached_la_SOURCES += byteorder.c
endif
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
libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
dtrace_probes.h: libmemcached_probes.d