From: Damir Tomic <viperus@ntp.org>
Date: Sat, 20 Jun 2015 12:16:03 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eeba8af64b1a4252c023a096a80af5d56f17f1a;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55855983nJMHLiHacoFvSnFh40mK6A
---

1eeba8af64b1a4252c023a096a80af5d56f17f1a
diff --cc sntp/tests/Makefile.am
index c0654ac36,9ec4b2693..01f5d05f4
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@@ -114,9 -114,24 +116,25 @@@ BUILT_SOURCES +=			
  	$(srcdir)/run-kodDatabase.c	\
  	$(srcdir)/run-kodFile.c		\
  	$(srcdir)/run-networking.c	\
 +	$(srcdir)/run-utilities.c	\
  	$(NULL)
  
+ test_crypto_CFLAGS =			\
+ 	-I$(top_srcdir)/unity		\
+ 	$(NULL)
+ 
+ test_crypto_LDADD =			\
+ 	$(unity_tests_LDADD)		\
+ 	$(NULL)
+ 
+ test_crypto_SOURCES =			\
+ 	crypto.c			\
+ 	run-crypto.c			\
+ 	$(top_builddir)/version.c	\
+ 	$(NULL)
+ 
+ $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
+ 	$(run_unity) crypto.c run-crypto.c
  
  test_keyFile_CFLAGS =			\
  	-I$(top_srcdir)/unity		\