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

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

bk: 55faa006fpObYmoIBmiWoSyM_TCGWw

diff --cc sntp/tests/Makefile.am
Simple merge

diff --cc tests/ntpd/Makefile.am
Simple merge

diff --cc tests/ntpq/Makefile.am
index c3183c8ffc987e3ccd23008a8355513447fa7c96,c729eee8bbff226ae548a4a5258450300a23ac29..a45a9aec05dd4933198a366cf892fdea4cf37a4e
--- 1/tests/ntpq/Makefile.am
--- 2/tests/ntpq/Makefile.am
+++ b/tests/ntpq/Makefile.am
@@@ -30,11 -29,11 +29,8 @@@ unity_tests_LDADD =                         
  
  AM_CFLAGS   = $(CFLAGS_NTP)
  
- 
  AM_CPPFLAGS  = $(NTP_INCS)
  AM_CPPFLAGS += -I$(top_srcdir)/ntpq
- AM_CPPFLAGS += -I$(top_srcdir)/sntp
- AM_CPPFLAGS += -I$(top_srcdir)/sntp/libopts
 -#AM_CPPFLAGS += -I$(top_srcdir)/sntp
 -#AM_CPPFLAGS += -I$(top_srcdir)/ntpd
 -#AM_CPPFLAGS += -I$(top_srcdir)/tests/libntp
  AM_CPPFLAGS += $(CPPFLAGS_NTP)
  AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
  AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
@@@ -48,10 -44,13 +41,10 @@@ BUILT_SOURCES +=                   
        $(srcdir)/run-t-ntpq.c          \
        $(NULL)
  
- noinst_HEADERS =      \
-               $(NULL)
+ noinst_HEADERS =                      \
+       $(NULL)
  
  ###
 -test_ntpq_CFLAGS =                    \
 -      -I$(top_srcdir)/sntp/unity      \
 -      $(NULL)
  
  test_ntpq_LDADD =                     \
        $(unity_tests_LDADD)            \