fix make distcheck with gtest by distributing test pieces

bk: 4cd1f915lDyZEWGskrYvho2T6xwVDQ

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index a314e5299b144cdcaafae68f0699fc6e5b053515..af0f8867e7008033710642f300eccecfa57aa0be 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -65,6 +65,7 @@ EXTRA_DIST=                           \
        sntp.1                          \
        sntp.html                       \
        sntp.texi                       \
+       tests_main.h                    \
        $(srcdir)/version.def           \
        $(srcdir)/version.m4            \
        $(srcdir)/version.texi          \

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index f373675158c6801ff09d1797fd88204f7a9f27af..50ee73830f58c993a9583deda9c0881d4dc258ca 100644 (file)
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 check_PROGRAMS = tests
 
 sntp_objs = ..
@@ -7,11 +9,13 @@ sntp_SOURCES_USED =   $(sntp_objs)/crypto.o           \
                        $(sntp_objs)/log.o              \
                        $(sntp_objs)/main.o             \
                        $(sntp_objs)/networking.o       \
-                       $(sntp_objs)/sntp-opts.o                \
-                       $(sntp_objs)/utilities.o
+                       $(sntp_objs)/sntp-opts.o        \
+                       $(sntp_objs)/utilities.o        \
+                       $(NULL)
 
 base_SOURCES =         $(srcdir)/../tests_main.cpp     \
-                       sntptest.cpp
+                       sntptest.cpp                    \
+                       $(NULL)
 
 tests_SOURCES = $(base_SOURCES)                \
                crypto.cpp              \
@@ -22,7 +26,27 @@ tests_SOURCES = $(base_SOURCES)              \
                networking.cpp          \
                packetHandling.cpp      \
                packetProcessing.cpp    \
-               utilities.cpp
+               utilities.cpp           \
+               $(NULL)
+
+noinst_HEADERS =       sntptest.h              \
+                       fileHandlingTest.h      \
+                       $(NULL)
+
+EXTRA_DIST =   data                    \
+               test-driver             \
+               $(NULL)
+
+CLEANFILES =   data/log-output-debug           \
+               data/kod-output-multiple        \
+               data/kod-output-single          \
+               data/debug-output-pkt           \
+               data/debug-output-lfp-dec       \
+               data/kod-output-blank           \
+               data/log-output-log             \
+               data/debug-output-lfp-bin       \
+               data/debug-output-lfp-hex       \
+               $(NULL)
 
 LDADD =        @GTEST_LDFLAGS@                 \
                @GTEST_LIBS@                    \
@@ -34,13 +58,13 @@ LDADD =     @GTEST_LDFLAGS@                 \
 AM_CXXFLAGS = @GTEST_CXXFLAGS@
 AM_CPPFLAGS = @GTEST_CPPFLAGS@
 
-INCLUDES = $(LIBOPTS_CFLAGS)                           \
-       -I$(top_srcdir)/../include                      \
-       -I$(top_srcdir)/../lib/isc/include              \
-       -I$(top_srcdir)/../lib/isc/nothreads/include    \
-       -I$(top_srcdir)/../lib/isc/unix/include         \
-       -I$(top_srcdir)/../tests                        \
-       -I$(top_srcdir)
+INCLUDES  = $(LIBOPTS_CFLAGS)
+INCLUDES += -I$(top_srcdir)/../include
+INCLUDES += -I$(top_srcdir)/../lib/isc/include
+INCLUDES += -I$(top_srcdir)/../lib/isc/nothreads/include
+INCLUDES += -I$(top_srcdir)/../lib/isc/unix/include
+INCLUDES += -I$(top_srcdir)/../tests
+INCLUDES += -I$(top_srcdir)
 
 TESTS = 
 

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 2e11d424827f9ffe129d7c018849013c1d4a346d..de9d5cfeafff887f7efece994f208d6625ade2d6 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -40,6 +40,9 @@ tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp     \
                uinttoa.cpp             \
                ymd2yd.cpp
 
+noinst_HEADERS =       lfptest.h       \
+                       libntptest.h    \
+                       sockaddrtest.h
 
 INCLUDES =                                             \
        -I$(top_srcdir)/include                         \