Move dnssec into src/

Makefile.am

 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libtap src/zscanner dnssec src tests samples doc man patches
+SUBDIRS = libtap src tests samples doc man patches
 
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-code-coverage
@@ -10,8 +10,8 @@ CODE_COVERAGE_DIRS =	\
 	src/knot	\
 	src/libknot	\
 	src/zscanner	\
-	dnssec/lib	\
-	dnssec/shared
+	src/dnssec/lib	\
+	src/dnssec/shared
 
 code_coverage_quiet = --quiet
 

configure.ac

@@ -433,12 +433,12 @@ AC_CONFIG_FILES([Makefile
 		 tests/Makefile
 		 src/dnstap/Makefile
 		 src/zscanner/Makefile
-		 dnssec/Makefile
-		 dnssec/man/Makefile
-		 dnssec/man/keymgr.8
-		 dnssec/man/knsec3hash.1
-		 dnssec/tests/Makefile
-		 dnssec/utils/Makefile
+		 src/dnssec/Makefile
+		 src/dnssec/man/Makefile
+		 src/dnssec/man/keymgr.8
+		 src/dnssec/man/knsec3hash.1
+		 src/dnssec/tests/Makefile
+		 src/dnssec/utils/Makefile
 		 doc/conf.py
 		 man/khost.1
 		 man/knotc.8

src/Makefile.am

 ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
-SUBDIRS = dnstap .
+SUBDIRS = zscanner dnssec dnstap .
 
 lib_LTLIBRARIES = libknot-int.la libknot.la
 noinst_LTLIBRARIES =
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
 	-DCONFIG_DIR='"${config_dir}"'		\
 	-DSTORAGE_DIR='"${storage_dir}"'	\
 	-DRUN_DIR='"${run_dir}"'		\
-	-I$(top_srcdir)/dnssec/lib
+	-I$(srcdir)/dnssec/lib
 
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
@@ -360,7 +360,7 @@ libknot_int_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO) $(lmdb_LI
 
 libknot_la_CPPFLAGS = $(AM_CPPFLAGS)
 libknot_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO)
-libknot_la_LIBADD  = libknot-int.la ../dnssec/libdnssec.la zscanner/libzscanner.la
+libknot_la_LIBADD  = libknot-int.la dnssec/libdnssec.la zscanner/libzscanner.la
 
 if HAVE_DAEMON
 
@@ -389,7 +389,7 @@ endif # HAVE_DAEMON
 if HAVE_UTILS
 
 # bin programs
-BIN_LIBS = ../dnssec/libdnssec.la libknot.la libknot-int.la libknotus.la
+BIN_LIBS = dnssec/libdnssec.la libknot.la libknot-int.la libknotus.la
 kdig_LDADD       = $(BIN_LIBS) $(libidn_LIBS)
 khost_LDADD      = $(BIN_LIBS) $(libidn_LIBS)
 knsupdate_LDADD  = $(BIN_LIBS) zscanner/libzscanner.la