Commit f1ebc54c authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[gitlab1] Makefiles updated

parent b516cf88
......@@ -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
......
......@@ -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
......
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment