From: Damir Tomic <viperus@ntp.org>
Date: Fri, 3 Jul 2015 19:39:48 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580dcef20ed95fd0e384629bf897aa4158b1ad7a;p=thirdparty%2Fntp.git

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

bk: 5596e504Io0lQcykO36wJbrl7TjiEQ
---

580dcef20ed95fd0e384629bf897aa4158b1ad7a
diff --cc tests/Makefile.am
index 75890a42c,3232bc39b..cfac4269d
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -11,7 -11,7 +11,8 @@@ DIST_SUBDIRS 
  SUBDIRS +=		\
  	bug-2803	\
  	libntp		\
+ 	ntpd		\
 +	sec-2853	\
  	$(NULL)
  
  DIST_SUBDIRS +=		\
diff --cc tests/ntpd/Makefile.am
index 96753e420,1f23fe147..b372781de
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -19,10 -36,9 +36,11 @@@ AM_CXXFLAGS = $(GTEST_CXXFLAGS
  AM_CPPFLAGS  = $(NTP_INCS)
  AM_CPPFLAGS += -I$(top_srcdir)/sntp
  AM_CPPFLAGS += -I$(top_srcdir)/ntpd
+ AM_CPPFLAGS += -I$(top_srcdir)/tests/libntp
  AM_CPPFLAGS += $(GTEST_CPPFLAGS)
  AM_CPPFLAGS += $(CPPFLAGS_NTP)
 +AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
 +AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
  
  AM_LDFLAGS = $(LDFLAGS_NTP)