X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=28456b59129422146442be9038fa22320b39ebba;hb=3e87de62b0b39279bdec62a07b45e42fe798fd41;hp=274fd25c907ab309fa2d0a93c63afc8f7f6838d0;hpb=27ee6d2aea6210eaca004475600aba78b7170883;p=m6w6%2Flibmemcached diff --git a/libmemcached/include.am b/libmemcached/include.am index 274fd25c..28456b59 100644 --- a/libmemcached/include.am +++ b/libmemcached/include.am @@ -83,15 +83,9 @@ nobase_include_HEADERS+= \ libmemcached/watchpoint.h lib_LTLIBRARIES+= libmemcached/libmemcached.la -libmemcached_libmemcached_la_CFLAGS= \ - ${AM_CFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHED +libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED -libmemcached_libmemcached_la_CXXFLAGS= \ - ${AM_CXXFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHED +libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED libmemcached_libmemcached_la_SOURCES+= \ ${libhashkit_libhashkit_la_SOURCES} \ @@ -140,7 +134,7 @@ libmemcached/options.cc: libmemcached/csl/parser.h libmemcached_libmemcached_la_DEPENDENCIES= libmemcached_libmemcached_la_LIBADD= $(LIBM) -libmemcached_libmemcached_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION} +libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION} libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2) libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc