First pass in merging libtest

[awesomized/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index cb393a221d0453873b88bdecd8d80b53a5ad846d..7f6b6a3fdbdbfe30166976ed57bdec42472eaef9 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -31,6 +31,7 @@ drd:
        @echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
 
 EXTRA_DIST+= libtest/run.gdb
+EXTRA_DIST+= libtest/version.h
 
 CLEANFILES+= tmp_chroot/etc/*
 CLEANFILES+= tmp_chroot/var/drizzle/*
@@ -38,6 +39,8 @@ CLEANFILES+= tmp_chroot/var/log/*
 CLEANFILES+= tmp_chroot/var/run/*
 CLEANFILES+= tmp_chroot/var/tmp/*
 
+BUILT_SOURCES+= libtest/version.h
+
 .PHONY: distclean-libtest-check
 distclean-libtest-check:
        -rm -rf tmp_chroot
@@ -47,6 +50,7 @@ noinst_HEADERS+= libtest/binaries.h
 noinst_HEADERS+= libtest/cpu.hpp 
 noinst_HEADERS+= libtest/blobslap_worker.h 
 noinst_HEADERS+= libtest/callbacks.h 
+noinst_HEADERS+= libtest/dns.hpp 
 noinst_HEADERS+= libtest/cmdline.h 
 noinst_HEADERS+= libtest/collection.h 
 noinst_HEADERS+= libtest/common.h 
@@ -67,6 +71,8 @@ noinst_HEADERS+= libtest/is_local.hpp
 noinst_HEADERS+= libtest/killpid.h 
 noinst_HEADERS+= libtest/libtool.hpp 
 noinst_HEADERS+= libtest/memcached.h 
+noinst_HEADERS+= libtest/memcached.hpp
+noinst_HEADERS+= libtest/poll_error.hpp
 noinst_HEADERS+= libtest/port.h 
 noinst_HEADERS+= libtest/runner.h 
 noinst_HEADERS+= libtest/server.h 
@@ -80,6 +86,7 @@ noinst_HEADERS+= libtest/test.h
 noinst_HEADERS+= libtest/test.hpp 
 noinst_HEADERS+= libtest/tmpfile.hpp 
 noinst_HEADERS+= libtest/vchar.hpp 
+noinst_HEADERS+= libtest/version.h 
 noinst_HEADERS+= libtest/visibility.h 
 noinst_HEADERS+= libtest/wait.h
 
@@ -91,6 +98,7 @@ libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
 libtest_libtest_la_SOURCES+= libtest/binaries.cc 
+libtest_libtest_la_SOURCES+= libtest/dns.cc 
 libtest_libtest_la_SOURCES+= libtest/cmdline.cc 
 libtest_libtest_la_SOURCES+= libtest/comparison.cc 
 libtest_libtest_la_SOURCES+= libtest/collection.cc