Merge in all current libmemcached work, plus restore older, working,

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index e6012ddca164e6b5a55ac35362c6d2c253b39461..fb859b665c674f9a735245fbc90dc67166ccfb5e 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -7,8 +7,16 @@
 #
 # 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/failed.h \
                 libtest/server.h \
                 libtest/test.h \
                 libtest/visibility.h
@@ -17,5 +25,16 @@ 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/test.c
+libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+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