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 e6012ddca164e6b5a55ac35362c6d2c253b39461..610521a766a0c0115cebd87f29f368c530f8eeec 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -7,9 +7,27 @@
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
+#
+
+LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+
+CLEANFILES+= \
+            tests/var/log/* \
+            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
 
@@ -17,5 +35,17 @@ noinst_LTLIBRARIES+= libtest/libserver.la
 libtest_libserver_la_SOURCES= libtest/server.c
 
 noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES= libtest/test.c
+libtest_libtest_la_SOURCES=\
+                          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
+       $(mkdir_p) tests/var
+
+tests/var/log:
+       $(mkdir_p) tests/var/log
 
+tests/var/tmp:
+       $(mkdir_p) tests/var/tmp