Merge in trunk. Updates to manual/update to latest libtest.

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index fb859b665c674f9a735245fbc90dc67166ccfb5e..610521a766a0c0115cebd87f29f368c530f8eeec 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -16,8 +16,18 @@ CLEANFILES+= \
             tests/var/tmp/*
 
 noinst_HEADERS+= \
+                libtest/callbacks.h \
+                libtest/collection.h \
+                libtest/common.h \
+                libtest/core.h \
+                libtest/error.h \
                 libtest/failed.h \
+                libtest/framework.h \
+                libtest/get.h \
+                libtest/runner.h \
                 libtest/server.h \
+                libtest/stats.h \
+                libtest/strerror.h \
                 libtest/test.h \
                 libtest/visibility.h
 
@@ -26,8 +36,9 @@ libtest_libserver_la_SOURCES= libtest/server.c
 
 noinst_LTLIBRARIES+= libtest/libtest.la
 libtest_libtest_la_SOURCES=\
-                          libtest/test.c
-libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+                          libtest/framework.cc \
+                          libtest/test.cc
+libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
 libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
 
 tests/var: tests/var/log tests/var/tmp