projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Create version 1.0 directory structure.
[awesomized/libmemcached]
/
libmemcached
/
util
/
include.am
diff --git
a/libmemcached/util/include.am
b/libmemcached/util/include.am
index 2c452f526247cee8efcfc45c2239a1785d306c68..3aa95a5a37ddc96b47590f4c90a4b0aa44bc2126 100644
(file)
--- a/
libmemcached/util/include.am
+++ b/
libmemcached/util/include.am
@@
-2,31
+2,22
@@
# 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
-if BUILD_LIBMEMCACHEDUTIL
-nobase_include_HEADERS+= \
- libmemcached/memcached_util.h \
- libmemcached/util.h \
- libmemcached/util/ping.h \
- libmemcached/util/pool.h \
- libmemcached/util/version.h
lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
-endif
libmemcached_libmemcachedutil_la_SOURCES= \
libmemcached_libmemcachedutil_la_SOURCES= \
+ libmemcached/backtrace.cc \
+ libmemcached/util/flush.cc \
+ libmemcached/util/pid.cc \
libmemcached/util/ping.cc \
libmemcached/util/pool.cc \
libmemcached/util/version.cc
libmemcached/util/ping.cc \
libmemcached/util/pool.cc \
libmemcached/util/version.cc
-libmemcached_libmemcachedutil_la_CFLAGS= \
- ${AM_CFLAGS} \
- ${NO_CONVERSION} \
- ${PTHREAD_CFLAGS} \
- -DBUILDING_LIBMEMCACHED
libmemcached_libmemcachedutil_la_CXXFLAGS= \
${AM_CXXFLAGS} \
${NO_CONVERSION} \
libmemcached_libmemcachedutil_la_CXXFLAGS= \
${AM_CXXFLAGS} \
${NO_CONVERSION} \
- ${PTHREAD_CFLAGS} \
-DBUILDING_LIBMEMCACHED
-DBUILDING_LIBMEMCACHED
+libmemcached_libmemcachedutil_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
+libmemcached_libmemcachedutil_la_LIBADD+= ${PTHREAD_LIBS}
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la