From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 17 Sep 2015 11:12:06 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_72~2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ded498a4b0b891c0a3f1c71fdb5f4365c42538fd;p=thirdparty%2Fntp.git

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

bk: 55faa006fpObYmoIBmiWoSyM_TCGWw
---

ded498a4b0b891c0a3f1c71fdb5f4365c42538fd
diff --cc tests/ntpq/Makefile.am
index c3183c8ff,c729eee8b..a45a9aec0
--- a/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)		\