From: Damir Tomic <viperus@ntp.org>
Date: Thu, 6 Aug 2015 19:03:10 +0000 (+0200)
Subject: Makefile.am:
X-Git-Tag: NTP_4_3_72~2^2~20^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5acd4c0446840b572643c810bba1dabb0c7b158b;p=thirdparty%2Fntp.git

Makefile.am:
  adding new Makefile
  minor change
Makefile.am, t-ntpq.c:
  update

bk: 55c3af6egc9rOkRY4vuTTL1BdCMeSA
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb43cbaaa..d11a1b38a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS +=		\
 	bug-2803	\
 	libntp		\
 	sec-2853	\
+	ntpd		\
 	ntpq		\
 	$(NULL)
 
diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am
index 4bb353024..d724a44eb 100644
--- a/tests/ntpq/Makefile.am
+++ b/tests/ntpq/Makefile.am
@@ -8,19 +8,18 @@ std_unity_list = 						\
 
 run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
-check_PROGRAMS =		\
-	test-ntpq		\
+check_PROGRAMS = 	\
+	test-ntpq	\
 	$(NULL)
 
 
 LDADD =					\
+	$(top_builddir)/ntpq/libntpq.a	\
 	$(top_builddir)/ntpd/libntpd.a	\
 	$(top_builddir)/libntp/libntp.a	\
 	$(LDADD_LIBNTP)			\
 	$(PTHREAD_LIBS)			\
 	$(LDADD_NTP)			\
-	$(GTEST_LDFLAGS)		\
-	$(GTEST_LIBS)			\
 	$(NULL)
 
 unity_tests_LDADD =				\
@@ -32,9 +31,10 @@ unity_tests_LDADD =				\
 AM_CFLAGS   = $(CFLAGS_NTP)
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
-AM_CPPFLAGS += -I$(top_srcdir)/ntpq
+
 
 AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/ntpq
 #AM_CPPFLAGS += -I$(top_srcdir)/sntp
 #AM_CPPFLAGS += -I$(top_srcdir)/ntpd
 #AM_CPPFLAGS += -I$(top_srcdir)/tests/libntp
@@ -45,19 +45,15 @@ AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
-tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp	\
-		t-ntp_signd.c		\
+tests_SOURCES = t-ntpq.c		\
 		$(NULL)
 
 BUILT_SOURCES +=			\
-	$(srcdir)/run-rc_cmdlength.c		\
-	$(srcdir)/run-t-ntp_signd.c		\
+	$(srcdir)/run-t-ntpq.c		\
 	$(NULL)
 
-noinst_HEADERS =	g_ntpdtest.h		\
-			$(srcdir)/../libntp/test-libntp.h	\
-			$(srcdir)/../libntp/sockaddrtest.h	\
-			$(NULL)
+noinst_HEADERS =	\
+		$(NULL)
 
 ###
 test_ntpq_CFLAGS =			\
@@ -77,7 +73,6 @@ $(srcdir)/run-t-ntpq.c: $(srcdir)/t-ntpq.c $(std_unity_list)
 	$(run_unity) t-ntpq.c run-t-ntpq.c
 
 
-
 TESTS =
 
 if !NTP_CROSSCOMPILE
@@ -110,8 +105,6 @@ check-libunity: ../../sntp/unity/libunity.a
 ../../sntp/unity/libunity.a:
 	cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 
-$(top_builddir)/ntpd/ntpdsim-ntp_prio_q.o:
-	cd ../../ntpd/ && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_prio_q.o
 
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf
diff --git a/tests/ntpq/t-ntpq.c b/tests/ntpq/t-ntpq.c
index f64e7287f..c390ddb63 100644
--- a/tests/ntpq/t-ntpq.c
+++ b/tests/ntpq/t-ntpq.c
@@ -4,7 +4,7 @@
 #include "ntp_stdlib.h"
 
 #include "unity.h"
-
+#include "ntpq.h"
 
 void testPrimary(void);