Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 5596e504Io0lQcykO36wJbrl7TjiEQ

diff --cc tests/Makefile.am
index 75890a42c22a412f3fc3f0989b0d0a3e9b7218ab,3232bc39b20d68af08d2a9e37fc26ce00547a967..cfac4269d2182dde7b70f4da43c28a673a655284
--- 1/tests/Makefile.am
--- 2/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/libntp/Makefile.am
Simple merge

diff --cc tests/ntpd/Makefile.am
index 96753e4205875d493cb56bb9fa1be832de94418c,1f23fe147b21ac1a01cc1a1519b8b96843ea0271..b372781deed0f2373567a7a4aa722e28b62589dc
--- 1/tests/ntpd/Makefile.am
--- 2/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)