X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Futil%2Finclude.am;h=10f3b944331153457ae040e6555e5f8737289582;hb=9991f8515bf7892f7dcf1abea364cd93f528eeb4;hp=449b2c1882aded433e194cd63f178bf3163049ba;hpb=28adf7b936c6f5c25b7526ff56ec1256da1246d4;p=m6w6%2Flibmemcached

diff --git a/libmemcached/util/include.am b/libmemcached/util/include.am
index 449b2c18..10f3b944 100644
--- a/libmemcached/util/include.am
+++ b/libmemcached/util/include.am
@@ -2,33 +2,30 @@
 # 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/flush.h \
+			 libmemcached/util/pid.h \
 			 libmemcached/util/ping.h \
 			 libmemcached/util/pool.h \
 			 libmemcached/util/version.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
-endif
 
 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_libmemcachedutil_la_CFLAGS= \
-					 ${AM_CFLAGS} \
-					 ${NO_CONVERSION} \
-					 ${PTHREAD_CFLAGS} \
-					 -DBUILDING_LIBMEMCACHED
 libmemcached_libmemcachedutil_la_CXXFLAGS= \
 					   ${AM_CXXFLAGS} \
 					   ${NO_CONVERSION} \
-					   ${PTHREAD_CFLAGS} \
 					   -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcachedutil_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
 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