projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Align memcached_st.
[awesomized/libmemcached]
/
libmemcached
/
Makefile.am
diff --git
a/libmemcached/Makefile.am
b/libmemcached/Makefile.am
index 74a5bbe2e5a81e5c0b0d6bb8ef1de0e0e64e52ba..ebb31be57790ad1974af46d183f5aa20fe152346 100644
(file)
--- a/
libmemcached/Makefile.am
+++ b/
libmemcached/Makefile.am
@@
-1,22
+1,19
@@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt
libmemcached.ver
BUILT_SOURCES= @DTRACE_HEADER@
BUILT_SOURCES= @DTRACE_HEADER@
-INCLUDES = -I$(top_builddir)
-LIBS = @LIBS@
-
EXTRA_HEADERS =
DTRACE = @DTRACE@
DTRACEFLAGS = @DTRACEFLAGS@
noinst_HEADERS = libmemcached_probes.h \
EXTRA_HEADERS =
DTRACE = @DTRACE@
DTRACEFLAGS = @DTRACEFLAGS@
noinst_HEADERS = libmemcached_probes.h \
+ libmemcached_config.h \
memcached_io.h \
common.h \
memcached/protocol_binary.h @DTRACE_HEADER@
pkginclude_HEADERS= memcached.h \
memcached.hh \
memcached_io.h \
common.h \
memcached/protocol_binary.h @DTRACE_HEADER@
pkginclude_HEADERS= memcached.h \
memcached.hh \
- libmemcached_config.h \
memcached_constants.h \
memcached_get.h \
memcached_result.h \
memcached_constants.h \
memcached_get.h \
memcached_result.h \
@@
-26,10
+23,13
@@
pkginclude_HEADERS= memcached.h \
memcached_types.h \
memcached_watchpoint.h
memcached_types.h \
memcached_watchpoint.h
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h memcached_pool.h
+endif
+
lib_LTLIBRARIES = libmemcached.la
libmemcached_la_SOURCES = crc.c \
lib_LTLIBRARIES = libmemcached.la
libmemcached_la_SOURCES = crc.c \
- hsieh_hash.c \
memcached.c \
memcached_auto.c \
memcached_analyze.c \
memcached.c \
memcached_auto.c \
memcached_analyze.c \
@@
-38,8
+38,8
@@
libmemcached_la_SOURCES = crc.c \
memcached_connect.c \
memcached_delete.c \
memcached_do.c \
memcached_connect.c \
memcached_delete.c \
memcached_do.c \
+ memcached_dump.c \
memcached_fetch.c \
memcached_fetch.c \
- memcached_fetch_execute.c \
memcached_flush.c \
memcached_get.c \
memcached_hash.c \
memcached_flush.c \
memcached_get.c \
memcached_hash.c \
@@
-63,14
+63,18
@@
libmemcached_la_SOURCES = crc.c \
murmur_hash.c \
jenkins_hash.c
murmur_hash.c \
jenkins_hash.c
+if INCLUDE_HSIEH_SRC
+libmemcached_la_SOURCES += hsieh_hash.c
+endif
+
if BUILD_BYTEORDER
libmemcached_la_SOURCES += byteorder.c
endif
if BUILD_BYTEORDER
libmemcached_la_SOURCES += byteorder.c
endif
-
AM_CFLAGS
= -DMEMCACHED_INTERNAL
+
DEFS +
= -DMEMCACHED_INTERNAL
libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
libmemcached_la_LIBADD = @DTRACE_OBJ@
libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
libmemcached_la_LIBADD = @DTRACE_OBJ@
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)
+libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)
$(LD_VERSION_SCRIPT) $(LIBM)
dtrace_probes.h: libmemcached_probes.d
$(DTRACE) $(DTRACEFLAGS) -o dtrace_probes.tmp -h -s libmemcached_probes.d
dtrace_probes.h: libmemcached_probes.d
$(DTRACE) $(DTRACEFLAGS) -o dtrace_probes.tmp -h -s libmemcached_probes.d