From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 00:57:43 +0000 (+0000)
Subject: sntp/tests/Makefile.am cleanup
X-Git-Tag: NTP_4_3_43~2^2~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=842a3c8feec58c0eab9f15bfe03a776a57193fd0;p=thirdparty%2Fntp.git

sntp/tests/Makefile.am cleanup

bk: 5584ba87Hk1ZeANkcTKbOshe9mwVTA
---

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index b9180c901..32b6ff210 100644
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -6,9 +6,11 @@ EXTRA_PROGRAMS =
 
 run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
-EXTRA_PROGRAMS +=	test-keyFile
+# Use EXTRA_PROGRAMS for test files that are under development but
+# not production-ready
+#EXTRA_PROGRAMS +=	test-keyFile
 
-check_PROGRAMS = 		\
+check_PROGRAMS =		\
 	test-keyFile		\
 	test-kodDatabase	\
 	test-kodFile		\
@@ -105,22 +107,31 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
-
 BUILT_SOURCES +=			\
-	$(srcdir)/run-networking.c	\
-	$(srcdir)/run-kodDatabase.c	\
 	$(srcdir)/run-keyFile.c		\
+	$(srcdir)/run-kodDatabase.c	\
 	$(srcdir)/run-kodFile.c		\
+	$(srcdir)/run-networking.c	\
 	$(NULL)
 
-test_networking_CFLAGS =		\
+test_keyFile_CFLAGS =			\
 	-I$(top_srcdir)/unity		\
 	$(NULL)
 
-test_networking_LDADD =			\
+test_keyFile_LDADD =			\
 	$(unity_tests_LDADD)		\
 	$(NULL)
 
+test_keyFile_SOURCES =			\
+	keyFile.c			\
+	run-keyFile.c			\
+	$(top_builddir)/version.c	\
+	$(NULL)
+
+$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
+	$(run_unity) keyFile.c run-keyFile.c
+
+
 test_kodDatabase_CFLAGS =		\
 	-I$(top_srcdir)/unity		\
 	$(NULL)
@@ -129,13 +140,15 @@ test_kodDatabase_LDADD =		\
 	$(unity_tests_LDADD)		\
 	$(NULL)
 
-test_keyFile_CFLAGS =			\
-	-I$(top_srcdir)/unity		\
+test_kodDatabase_SOURCES =		\
+	kodDatabase.c			\
+	run-kodDatabase.c		\
+	$(top_builddir)/version.c	\
 	$(NULL)
 
-test_keyFile_LDADD =			\
-	$(unity_tests_LDADD)		\
-	$(NULL)
+$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
+	$(run_unity) kodDatabase.c run-kodDatabase.c
+
 
 test_kodFile_CFLAGS =			\
 	-I$(top_srcdir)/unity		\
@@ -145,47 +158,38 @@ test_kodFile_LDADD =			\
 	$(unity_tests_LDADD)		\
 	$(NULL)
 
-
-test_networking_SOURCES =		\
-	networking.c			\
-	run-networking.c		\
+test_kodFile_SOURCES =			\
+	kodFile.c			\
+	run-kodFile.c			\
 	$(top_builddir)/version.c	\
 	$(NULL)
+#	../version.c
 
-test_kodDatabase_SOURCES =		\
-	kodDatabase.c			\
-	run-kodDatabase.c		\
-	$(top_builddir)/version.c	\
+$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list)
+	$(run_unity) kodFile.c run-kodFile.c
+
+
+test_networking_CFLAGS =		\
+	-I$(top_srcdir)/unity		\
 	$(NULL)
 
-test_keyFile_SOURCES =			\
-	keyFile.c			\
-	run-keyFile.c			\
-	$(top_builddir)/version.c	\
+test_networking_LDADD =			\
+	$(unity_tests_LDADD)		\
 	$(NULL)
 
-test_kodFile_SOURCES =			\
-	kodFile.c			\
-	run-kodFile.c			\
+test_networking_SOURCES =		\
+	networking.c			\
+	run-networking.c		\
 	$(top_builddir)/version.c	\
 	$(NULL)
-#	../version.c
 
 $(srcdir)/run-networking.c: $(srcdir)/networking.c $(std_unity_list)
 	$(run_unity) networking.c run-networking.c
 
-$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
-	$(run_unity) kodDatabase.c run-kodDatabase.c
 
 #$(srcdir)/../version.c: $(srcdir)/../version.c
 #	gcc -o version.o ../version.c
 
-$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
-	$(run_unity) keyFile.c run-keyFile.c
-
-$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list)
-	$(run_unity) kodFile.c run-kodFile.c
-
 TESTS = 
 
 if !NTP_CROSSCOMPILE