projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix problem where hostname would end up with trailing . and be accepted as
[awesomized/libmemcached]
/
libmemcached
/
include.am
diff --git
a/libmemcached/include.am
b/libmemcached/include.am
index 123b1af3f4660c7720d3b7690c4cb64b766aa14d..b0d0731938c4d670e4c2836e65866e95ce29085c 100644
(file)
--- 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
# 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 \
EXTRA_DIST+= \
libmemcached/configure.h.in \
libmemcached/libmemcached_probes.d \
@@
-13,6
+17,7
@@
noinst_HEADERS+= \
libmemcached/do.h \
libmemcached/internal.h \
libmemcached/io.h \
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/libmemcached_probes.h \
libmemcached/protocol/ascii_handler.h \
libmemcached/protocol/binary_handler.h \
@@
-22,6
+27,7
@@
noinst_HEADERS+= \
nobase_include_HEADERS+= \
libmemcached/allocators.h \
libmemcached/analyze.h \
nobase_include_HEADERS+= \
libmemcached/allocators.h \
libmemcached/analyze.h \
+ libmemcached/array.h \
libmemcached/auto.h \
libmemcached/behavior.h \
libmemcached/callback.h \
libmemcached/auto.h \
libmemcached/behavior.h \
libmemcached/callback.h \
@@
-29,6
+35,7
@@
nobase_include_HEADERS+= \
libmemcached/constants.h \
libmemcached/delete.h \
libmemcached/dump.h \
libmemcached/constants.h \
libmemcached/delete.h \
libmemcached/dump.h \
+ libmemcached/error.h \
libmemcached/exception.hpp \
libmemcached/fetch.h \
libmemcached/flush.h \
libmemcached/exception.hpp \
libmemcached/fetch.h \
libmemcached/flush.h \
@@
-38,7
+45,9
@@
nobase_include_HEADERS+= \
libmemcached/memcached.h \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
libmemcached/memcached.h \
libmemcached/memcached.hpp \
libmemcached/memcached/protocol_binary.h \
+ libmemcached/options.h \
libmemcached/parse.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
+74,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
@@
-82,15
+92,17
@@
libmemcached_libmemcachedinternal_la_SOURCES= \
lib_LTLIBRARIES+= libmemcached/libmemcached.la
libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
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/allocators.c \
libmemcached/analyze.c \
+ libmemcached/array.c \
libmemcached/auto.c \
libmemcached/behavior.c \
libmemcached/connect.c \
libmemcached/delete.c \
libmemcached/do.c \
libmemcached/dump.c \
libmemcached/auto.c \
libmemcached/behavior.c \
libmemcached/connect.c \
libmemcached/delete.c \
libmemcached/do.c \
libmemcached/dump.c \
+ libmemcached/error.c \
libmemcached/fetch.c \
libmemcached/flush.c \
libmemcached/flush_buffers.c \
libmemcached/fetch.c \
libmemcached/flush.c \
libmemcached/flush_buffers.c \
@@
-100,6
+112,7
@@
libmemcached_libmemcached_la_SOURCES = \
libmemcached/io.c \
libmemcached/key.c \
libmemcached/memcached.c \
libmemcached/io.c \
libmemcached/key.c \
libmemcached/memcached.c \
+ libmemcached/options.cc \
libmemcached/parse.c \
libmemcached/purge.c \
libmemcached/quit.c \
libmemcached/parse.c \
libmemcached/purge.c \
libmemcached/quit.c \
@@
-113,6
+126,8
@@
libmemcached_libmemcached_la_SOURCES = \
libmemcached/verbosity.c \
libmemcached/version.c
libmemcached/verbosity.c \
libmemcached/version.c
+libmemcached/options.cc: libmemcached/options/parser.h
+
libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
@@
-132,8
+147,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
+162,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
+174,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
@@
-169,5
+186,5
@@
libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
.d.o:
libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
.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
\//"`