projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add pragma
[m6w6/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index fcc2d627e0baf470b99615deb509937914d0df5b..7d4841f8fb03a8273727b5eb97a4158ae863bb48 100644
(file)
--- a/
libmemcached/include.am
+++ b/
libmemcached/include.am
@@
-39,6
+39,7
@@
nobase_include_HEADERS+= \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
libmemcached/parse.h \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
libmemcached/parse.h \
+ libmemcached/platform.h \
libmemcached/protocol/cache.h \
libmemcached/protocol/callback.h \
libmemcached/protocol_handler.h \
libmemcached/protocol/cache.h \
libmemcached/protocol/callback.h \
libmemcached/protocol_handler.h \
@@
-65,7
+66,8
@@
libmemcached_libmemcachedprotocol_la_SOURCES = \
libmemcached/protocol/pedantic.c \
libmemcached/protocol/protocol_handler.c
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
noinst_LTLIBRARIES+= \
libmemcached/libmemcachedcallbacks.la
@@
-132,8
+134,9
@@
libmemcached_libmemcachedutil_la_SOURCES= \
libmemcached/util/ping.c \
libmemcached/util/pool.c \
libmemcached/util/version.c
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_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
libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
if BUILD_BYTEORDER
@@
-146,7
+149,7
@@
libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
endif
if HAVE_SASL
endif
if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(L
IBSASL
)
+libmemcached_libmemcached_la_LDFLAGS+= $(L
TLIBSASL) $(LTLIBSASL2
)
libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
endif
libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
endif
@@
-158,6
+161,7
@@
endif
if DTRACE_NEEDS_OBJECTS
libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
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
CLEANFILES+= libmemcached/libmemcached_probes.o
endif
@@
-166,8
+170,8
@@
SUFFIXES+= .d
libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
libmemcached/dtrace_probes.h: 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_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_
la_
OBJECTS} config.h
.d.o:
.d.o:
- $(DTRACE) $(DTRACEFLAGS) -o
libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}
\//"`
+ $(DTRACE) $(DTRACEFLAGS) -o
$@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached
\//"`