libknot: merge dnssec/dnssec.h into libknot/libknot.h

diff --git a/Knot.files b/Knot.files
index 48b587d9eb70ade4e346befc6f5965e9c7f6eec6..e2065759cdb2b0e1d0dc0ec6649de5366570c8c6 100644 (file)
--- a/Knot.files
+++ b/Knot.files
@@ -442,7 +442,6 @@ src/libknot/dnssec/crypto.c
 src/libknot/dnssec/crypto.h
 src/libknot/dnssec/digest.c
 src/libknot/dnssec/digest.h
-src/libknot/dnssec/dnssec.h
 src/libknot/dnssec/key.h
 src/libknot/dnssec/key/algorithm.c
 src/libknot/dnssec/key/algorithm.h

diff --git a/src/libknot/Makefile.inc b/src/libknot/Makefile.inc
index 6ecda90467d0637a9f85e1a25ac56e5cde09e778..b76ecd767483ffaa75f95e1c53aa644b7092c5b8 100755 (executable)
--- a/src/libknot/Makefile.inc
+++ b/src/libknot/Makefile.inc
@@ -41,7 +41,6 @@ nobase_include_libknot_HEADERS = \
        libknot/dnssec/binary.h                 \
        libknot/dnssec/crypto.h                 \
        libknot/dnssec/digest.h                 \
-       libknot/dnssec/dnssec.h                 \
        libknot/dnssec/key.h                    \
        libknot/dnssec/keyid.h                  \
        libknot/dnssec/keystore.h               \

diff --git a/src/libknot/dnssec/dnssec.h b/src/libknot/dnssec/dnssec.h
deleted file mode 100644 (file)
index 793cd09..0000000
--- a/src/libknot/dnssec/dnssec.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Copyright (C) CZ.NIC, z.s.p.o. and contributors
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  For more information, see <https://www.knot-dns.cz/>
- */
-
-/*!
- * \file
- *
- * Convenient header to include all library modules.
- */
-
-#pragma once
-
-#include "libknot/dnssec/binary.h"
-#include "libknot/dnssec/crypto.h"
-#include "libknot/dnssec/error.h"
-#include "libknot/dnssec/key.h"
-#include "libknot/dnssec/keyid.h"
-#include "libknot/dnssec/keystore.h"
-#include "libknot/dnssec/keytag.h"
-#include "libknot/dnssec/nsec.h"
-#include "libknot/dnssec/pem.h"
-#include "libknot/dnssec/random.h"
-#include "libknot/dnssec/sign.h"
-#include "libknot/dnssec/tsig.h"

diff --git a/src/libknot/libknot.h b/src/libknot/libknot.h
index 0b84a032c94fa27adfaac6d1791e93c4e1a240db..ff71b69e03c77bffc4c6172d8582212cceaeb280 100644 (file)
--- a/src/libknot/libknot.h
+++ b/src/libknot/libknot.h
@@ -37,6 +37,18 @@
 #include "libknot/db/db.h"
 #include "libknot/db/db_lmdb.h"
 #include "libknot/db/db_trie.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/digest.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keytag.h"
+#include "libknot/dnssec/nsec.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/random.h"
+#include "libknot/dnssec/sign.h"
+#include "libknot/dnssec/tsig.h"
 #include "libknot/packet/compr.h"
 #include "libknot/packet/pkt.h"
 #include "libknot/packet/rrset-wire.h"