From: Damir Tomic <viperus@ntp.org>
Date: Fri, 19 Jun 2015 15:26:11 +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=a897703c957af7fcdf3186c225b71e93e1ba58fa;p=thirdparty%2Fntp.git

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

bk: 55843493IiMODmrIt_K4S8MzyjFYnw
---

a897703c957af7fcdf3186c225b71e93e1ba58fa
diff --cc tests/libntp/Makefile.am
index ac509eb17,f007d867e..b19a46412
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -24,9 -25,9 +25,10 @@@ check_PROGRAMS =		
  	test-numtohost		\
  	test-octtoint		\
  	test-refnumtoa		\
 +	test-ssl_init		\
  	test-socktoa		\
  	test-statestr		\
+ 	test-strtolfp       \
  	test-timespecops	\
  	test-timevalops		\
  	test-uglydate		\
@@@ -98,10 -99,10 +100,10 @@@ tests_SOURCES =					
  	recvbuff.cpp		\
  	g_refnumtoa.cpp		\
  	sfptostr.cpp		\
 -	socktoa.cpp		\
 -	ssl_init.cpp		\
 +	g_socktoa.cpp		\
 +	g_ssl_init.cpp		\
  	g_statestr.cpp		\
- 	strtolfp.cpp		\
+ 	g_strtolfp.cpp		\
  	g_timespecops.cpp	\
  	timestructs.cpp		\
  	g_timevalops.cpp	\
@@@ -130,11 -132,9 +133,12 @@@ BUILT_SOURCES +=			
  	$(srcdir)/run-numtohost.c	\
  	$(srcdir)/run-octtoint.c	\
  	$(srcdir)/run-refnumtoa.c	\
 +	$(srcdir)/run-ssl_init.c	\
  	$(srcdir)/run-socktoa.c		\
  	$(srcdir)/run-statestr.c	\
+ 	$(srcdir)/run-strtolfp.c	\
 +	$(srcdir)/run-timevalops.c	\
 +	$(srcdir)/run-timespecops.c	\
  	$(srcdir)/run-uglydate.c	\
  	$(srcdir)/run-vi64ops.c		\
  	$(srcdir)/run-ymd2yd.c		\