From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 14 Aug 2018 15:29:11 +0000 (+0200)
Subject: [gitlab1] Makefiles updated
X-Git-Tag: gitlab29-base~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ebc54ceab8d1823212d0b1f4a2e9ad622a908a;p=thirdparty%2Fkea.git

[gitlab1] Makefiles updated
---

diff --git a/configure.ac b/configure.ac
index bcee1b4bbe..0747a0db85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1500,6 +1500,7 @@ AC_CONFIG_FILES([Makefile
                  src/bin/lfc/tests/Makefile
                  src/bin/netconf/Makefile
                  src/bin/netconf/tests/Makefile
+                 src/bin/netconf/tests/netconf_tests.sh
                  src/bin/perfdhcp/Makefile
                  src/bin/perfdhcp/tests/Makefile
                  src/bin/perfdhcp/tests/testdata/Makefile
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index e45829389e..1c2ce7ff7b 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -57,21 +57,8 @@ sbin_PROGRAMS = kea-netconf
 kea_netconf_SOURCES  = main.cc
 
 kea_netconf_LDADD  = libnetconf.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
-#kea_netconf_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_netconf_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(SYSREPO_LIBS)
 
@@ -92,11 +79,11 @@ if GENERATE_PARSER
 # Call flex with -s to check that the default rule can be suppressed
 # Call bison with -W to get warnings like unmarked empty rules
 # Note C++11 deprecated register still used by flex < 2.6.0
-location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h: netconf_parser.yy
-	$(YACC) --defines=netconf_parser.h --report=all --report-file=netconf_parser.report -o netconf_parser.cc netconf_parser.yy
+#location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h: netconf_parser.yy
+#	$(YACC) --defines=netconf_parser.h --report=all --report-file=netconf_parser.report -o netconf_parser.cc netconf_parser.yy
 
-netconf_lexer.cc: netconf_lexer.ll
-	$(LEX) --prefix netconf_ -o netconf_lexer.cc netconf_lexer.ll
+#netconf_lexer.cc: netconf_lexer.ll
+#	$(LEX) --prefix netconf_ -o netconf_lexer.cc netconf_lexer.ll
 
 else
 
diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
index 5e3384a9ab..cb326e8443 100644
--- a/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@ -1,5 +1,11 @@
 SHTESTS =
 
+SHTESTS += netconf_tests.sh
+
+noinst_SCRIPTS = netconf_tests.sh
+
+EXTRA_DIST = netconf_tests.sh.in
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 	for shtest in $(SHTESTS) ; do \
@@ -16,6 +22,8 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 CLEANFILES = *.json *.log
 
+DISTCLEANFILES = netconf_tests.sh
+
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
 if USE_STATIC_LINK