From: Dave Hart <hart@ntp.org>
Date: Thu, 4 Nov 2010 00:06:45 +0000 (+0000)
Subject: fix make distcheck with gtest by distributing test pieces
X-Git-Tag: NTP_4_2_7P78~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c6b83b2180b7a34120ae9d632573ee60995c26;p=thirdparty%2Fntp.git

fix make distcheck with gtest by distributing test pieces

bk: 4cd1f915lDyZEWGskrYvho2T6xwVDQ
---

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index a314e5299..af0f8867e 100644
--- 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 f37367515..50ee73830 100644
--- 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 2e11d4248..de9d5cfea 100644
--- 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				\