Commit f5b9dd68 authored by Daniel Salzman's avatar Daniel Salzman

utils: move knotd from knot

parent c26f246f
...@@ -244,7 +244,6 @@ src/knot/dnssec/zone-nsec.c ...@@ -244,7 +244,6 @@ src/knot/dnssec/zone-nsec.c
src/knot/dnssec/zone-nsec.h src/knot/dnssec/zone-nsec.h
src/knot/dnssec/zone-sign.c src/knot/dnssec/zone-sign.c
src/knot/dnssec/zone-sign.h src/knot/dnssec/zone-sign.h
src/knot/main.c
src/knot/modules/dnsproxy.c src/knot/modules/dnsproxy.c
src/knot/modules/dnsproxy.h src/knot/modules/dnsproxy.h
src/knot/modules/dnstap.c src/knot/modules/dnstap.c
...@@ -467,6 +466,7 @@ src/utils/knotc/estimator.h ...@@ -467,6 +466,7 @@ src/utils/knotc/estimator.h
src/utils/knotc/main.c src/utils/knotc/main.c
src/utils/knotc/remote.c src/utils/knotc/remote.c
src/utils/knotc/remote.h src/utils/knotc/remote.h
src/utils/knotd/main.c
src/utils/knsupdate/knsupdate_exec.c src/utils/knsupdate/knsupdate_exec.c
src/utils/knsupdate/knsupdate_exec.h src/utils/knsupdate/knsupdate_exec.h
src/utils/knsupdate/knsupdate_main.c src/utils/knsupdate/knsupdate_main.c
......
...@@ -11,7 +11,7 @@ m4_define([knot_PKG_VERSION],[knot_VERSION_MAJOR.knot_VERSION_MINOR.knot_VERSION ...@@ -11,7 +11,7 @@ m4_define([knot_PKG_VERSION],[knot_VERSION_MAJOR.knot_VERSION_MINOR.knot_VERSION
AC_INIT([knot], knot_PKG_VERSION, [knot-dns@labs.nic.cz]) AC_INIT([knot], knot_PKG_VERSION, [knot-dns@labs.nic.cz])
AM_INIT_AUTOMAKE([gnits subdir-objects no-dist-gzip dist-xz -Wall -Werror]) AM_INIT_AUTOMAKE([gnits subdir-objects no-dist-gzip dist-xz -Wall -Werror])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/knot/main.c]) AC_CONFIG_SRCDIR([src/knot])
AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS([_GNU_SOURCE]) AC_USE_SYSTEM_EXTENSIONS([_GNU_SOURCE])
......
...@@ -212,7 +212,7 @@ knotc_SOURCES = \ ...@@ -212,7 +212,7 @@ knotc_SOURCES = \
utils/knotc/main.c utils/knotc/main.c
knotd_SOURCES = \ knotd_SOURCES = \
knot/main.c utils/knotd/main.c
knot1to2_SOURCES = \ knot1to2_SOURCES = \
utils/knot1to2/cf-lex.c \ utils/knot1to2/cf-lex.c \
......
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \ -include $(top_builddir)/src/config.h \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/dnssec/lib -I$(top_srcdir)/src/dnssec/lib
LDADD = \ LDADD = \
$(top_builddir)/src/libknot.la $(top_builddir)/src/libknot.la
...@@ -18,5 +18,5 @@ endif ...@@ -18,5 +18,5 @@ endif
knotd_stdio_SOURCES = wrap/server.c wrap/tcp-handler.c wrap/udp-handler.c knotd_stdio_SOURCES = wrap/server.c wrap/tcp-handler.c wrap/udp-handler.c
knotd_stdio_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS) knotd_stdio_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS)
knotd_stdio_LDADD = \ knotd_stdio_LDADD = \
$(top_builddir)/src/knot/knotd-main.o \ $(top_builddir)/src/utils/knotd/knotd-main.o \
$(top_builddir)/src/libknotd.la $(liburcu_LIBS) $(top_builddir)/src/libknotd.la $(liburcu_LIBS)
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