From: Damir Tomic <viperus@ntp.org>
Date: Mon, 3 Aug 2015 08:08:54 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95df40334b15ae684a27bd2ed111c1a819f5ae25;p=thirdparty%2Fntp.git

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

bk: 55bf2196v6zt_qhwDOwI2mQpY00F4w
---

95df40334b15ae684a27bd2ed111c1a819f5ae25
diff --cc tests/ntpd/Makefile.am
index 7b859c79d,c984f9a77..b7b534cf7
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -12,9 -12,9 +12,10 @@@ check_PROGRAMS =		
  	test-leapsec		\
  	test-ntp_prio_q		\
  	test-ntp_restrict	\
+ 	test-ntp_util       \
  	test-rc_cmdlength   	\
  	test-ntp_scanner	\
 +	test-ntp_signdT		\
  	$(NULL)
  
  #	test-ntp_signd		\ #doesn't work, can't link it because you can't link static function
@@@ -60,8 -60,9 +61,9 @@@ tests_SOURCES = $(top_srcdir)/sntp/test
  		$(top_srcdir)/ntpd/ntp_leapsec.c	\
  		$(top_srcdir)/ntpd/ntp_prio_q.c		\
  		$(top_srcdir)/ntpd/ntp_restrict.c	\
+ 		$(top_srcdir)/ntpd/ntp_util.c	\
  		$(top_srcdir)/ntpd/rc_cmdlength.c	\
 -		$(top_srcdir)/ntpd/ntp_signd.c	\
 +		$(top_srcdir)/ntpd/ntp_signd.c		\
  		g_leapsec.cpp	\
  		$(NULL)
  
@@@ -69,8 -70,9 +71,9 @@@ BUILT_SOURCES +=			
  	$(srcdir)/run-leapsec.c		\
  	$(srcdir)/run-ntp_prio_q.c	\
  	$(srcdir)/run-ntp_restrict.c	\
+ 	$(srcdir)/run-ntp_util.c	\
  	$(srcdir)/run-rc_cmdlength.c		\
 -	$(srcdir)/run-ntp_signd.c		\
 +	$(srcdir)/run-ntp_signdT.c		\
  	$(NULL)
  
  noinst_HEADERS =	g_ntpdtest.h		\