From: Lokesh Walase <lokeshw24@ntp.org>
Date: Fri, 3 Jul 2015 19:46:54 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11a391f5ef0000db0383c11003a72b5b7fe4ea57;p=thirdparty%2Fntp.git

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
---

11a391f5ef0000db0383c11003a72b5b7fe4ea57
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)