X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Futil%2Finclude.am;h=3aa95a5a37ddc96b47590f4c90a4b0aa44bc2126;hb=fee8381b6b80398fcb6893860400ead6a598f15b;hp=2c452f526247cee8efcfc45c2239a1785d306c68;hpb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/util/include.am b/libmemcached/util/include.am
index 2c452f52..3aa95a5a 100644
--- 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
 
-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
-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