diff options
| author | Brian Aker <brian@tangent.org> | 2012-12-17 04:27:00 -0500 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2012-12-17 04:27:00 -0500 |
| commit | f12b5cdb0754dea2e3d55cea21ad25c7152e54cc (patch) | |
| tree | 042490ea01835de5761797f1d21d486bca12f49b /libmemcachedinternal | |
| parent | 91835aac219196d116555e7e0a83fde7393d1d8d (diff) | |
| download | libmemcached-f12b5cdb0754dea2e3d55cea21ad25c7152e54cc.tar.gz | |
Refactor DEPENDENCIES
Diffstat (limited to 'libmemcachedinternal')
| -rw-r--r-- | libmemcachedinternal/include.am | 2 | ||||
| -rw-r--r-- | libmemcachedinternal/util/include.am | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am index fafef9a3..f71472e3 100644 --- a/libmemcachedinternal/include.am +++ b/libmemcachedinternal/include.am @@ -23,5 +23,5 @@ libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS= \ ${NO_CONVERSION} \ -DBUILDING_LIBMEMCACHEDINTERNAL libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD) -libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(libmemcached_libmemcached_la_DEPENDENCIES) +EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES) endif diff --git a/libmemcachedinternal/util/include.am b/libmemcachedinternal/util/include.am index 7b5e8007..f5ac3cb0 100644 --- a/libmemcachedinternal/util/include.am +++ b/libmemcachedinternal/util/include.am @@ -12,8 +12,6 @@ libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS= \ ${AM_CXXFLAGS} \ ${NO_CONVERSION} \ -DBUILDING_LIBMEMCACHEDINTERNAL -libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= ${PTHREAD_CFLAGS} -libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS} -libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la - - +libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= @PTHREAD_CFLAGS@ +libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la +libmemcachedinternal_libmemcachedutilinternal_la_LIBADD+= @PTHREAD_LIBS@ |