diff options
| author | Brian Aker <brian@tangent.org> | 2012-12-20 06:06:31 -0500 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2012-12-20 06:06:31 -0500 |
| commit | 5d932b5b0b10d017f648fb22d66becfa849331a0 (patch) | |
| tree | f2ba1c0621611598da070f8d537b4daeab4560fb /libmemcached-1.2 | |
| parent | c1596d5be1acbdd6f9bef38f4cb62730dc5ac7b6 (diff) | |
| parent | 76bf27c007d5015d3dcf2981c942d8afb2e97302 (diff) | |
| download | libmemcached-5d932b5b0b10d017f648fb22d66becfa849331a0.tar.gz | |
Merge 1.0 trunk.
Diffstat (limited to 'libmemcached-1.2')
| -rw-r--r-- | libmemcached-1.2/t/include.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmemcached-1.2/t/include.am b/libmemcached-1.2/t/include.am index f88d3114..53fe8e0e 100644 --- a/libmemcached-1.2/t/include.am +++ b/libmemcached-1.2/t/include.am @@ -8,20 +8,18 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -LIBMEMCACHED_1_0_TEST_PATH= libmemcached-1.0/t +LIBMEMCACHED_2_0_TEST_PATH= libmemcached-2.0/t if SHARED_ENABLED # Test linking with C application libmemcached_1_2_t_c_test_SOURCES= libmemcached-1.2/t/c_test.c libmemcached_1_2_t_c_test_LDADD= libmemcached/libmemcached.la -libmemcached_1_2_t_c_test_DEPENDENCIES= libmemcached/libmemcached.la check_PROGRAMS+= libmemcached-1.2/t/c_test noinst_PROGRAMS+= libmemcached-1.2/t/c_test # Test linking with C application/SASL include libmemcached_1_2_t_c_sasl_test_SOURCES= libmemcached-1.2/t/c_sasl_test.c libmemcached_1_2_t_c_sasl_test_LDADD= libmemcached/libmemcached.la -libmemcached_1_2_t_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la check_PROGRAMS+= libmemcached-1.2/t/c_sasl_test noinst_PROGRAMS+= libmemcached-1.2/t/c_sasl_test else @@ -30,6 +28,5 @@ endif # Test linking with C++ application libmemcached_1_2_t_cc_test_SOURCES= libmemcached-1.2/t/cc_test.cc libmemcached_1_2_t_cc_test_LDADD= libmemcached/libmemcached.la -libmemcached_1_2_t_cc_test_DEPENDENCIES= libmemcached/libmemcached.la check_PROGRAMS+= libmemcached-1.2/t/cc_test noinst_PROGRAMS+= libmemcached-1.2/t/cc_test |