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

into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 5596e6ae8KSjTZXRkbdXjjT6y1aNRw

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)