Merge libknot-yparser into libknot

configure.ac

@@ -36,13 +36,11 @@ libknot_VERSION_INFO         = -version-info 1:0:1
 libdnssec_VERSION_INFO       = -version-info 0:0:0
 libknot_int_VERSION_INFO     = -version-info 0:0:0
 libzscanner_VERSION_INFO     = -version-info 0:1:0
-libknot_yparser_VERSION_INFO = -version-info 0:0:0
 
 AC_SUBST(libknot_VERSION_INFO)
 AC_SUBST(libdnssec_VERSION_INFO)
 AC_SUBST(libknot_int_VERSION_INFO)
 AC_SUBST(libzscanner_VERSION_INFO)
-AC_SUBST(libknot_yparser_VERSION_INFO)
 
 # Automatically update release date based on configure.ac date
 release_date=$(sed -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS)
@@ -67,7 +65,6 @@ LT_INIT
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
 AC_CONFIG_FILES([src/libknot.pc
 		 src/libknot-int.pc
-		 src/libknot-yparser.pc
 		 src/dnssec/libdnssec.pc])
 
 # Build Knot DNS daemon

src/Makefile.am

@@ -3,8 +3,7 @@ SUBDIRS = zscanner dnssec dnstap .
 
 lib_LTLIBRARIES =				\
 	libknot-int.la				\
-	libknot.la				\
-	libknot-yparser.la
+	libknot.la
 noinst_LTLIBRARIES =
 
 AM_CPPFLAGS = \
@@ -52,13 +51,6 @@ nobase_libknot_int_la_HEADERS =			\
 	libknot/internal/trie/murmurhash3.h	\
 	libknot/internal/utils.h
 
-libknot_yparser_ladir = $(includedir)
-nobase_libknot_yparser_la_HEADERS =		\
-	libknot/yparser/yparser.h		\
-	libknot/yparser/ypformat.h		\
-	libknot/yparser/ypscheme.h		\
-	libknot/yparser/yptrafo.h
-
 # dynamic: libknot internal sources
 libknot_int_la_SOURCES =			\
 	libknot/internal/base32hex.c		\
@@ -84,14 +76,6 @@ libknot_int_la_SOURCES =			\
 	libknot/internal/utils.c		\
 	$(nobase_libknot_int_la_HEADERS)
 
-libknot_yparser_la_SOURCES =			\
-	libknot/yparser/yparser.c		\
-	libknot/yparser/ypbody.c		\
-	libknot/yparser/ypformat.c		\
-	libknot/yparser/ypscheme.c		\
-	libknot/yparser/yptrafo.c		\
-	$(nobase_libknot_yparser_la_HEADERS)
-
 # dynamic: libknot headers
 libknot_ladir = $(includedir)
 nobase_libknot_la_HEADERS =			\
@@ -126,6 +110,13 @@ nobase_libknot_la_HEADERS =			\
 	libknot/rrtype/tsig.h			\
 	libknot/tsig-op.h
 
+noinst_libknot_ladir = $(includedir)
+noinst_libknot_la_HEADERS = 			\
+	libknot/yparser/yparser.h		\
+	libknot/yparser/ypformat.h		\
+	libknot/yparser/ypscheme.h		\
+	libknot/yparser/yptrafo.h
+
 # dynamic: libknot sources
 libknot_la_SOURCES =				\
 	libknot/binary.c			\
@@ -149,23 +140,25 @@ libknot_la_SOURCES =				\
 	libknot/rrtype/opt.c			\
 	libknot/rrtype/tsig.c			\
 	libknot/tsig-op.c			\
-	$(nobase_libknot_la_HEADERS)
+	libknot/yparser/yparser.c		\
+	libknot/yparser/ypbody.c		\
+	libknot/yparser/ypformat.c		\
+	libknot/yparser/ypscheme.c		\
+	libknot/yparser/yptrafo.c		\
+	$(nobase_libknot_la_HEADERS)		\
+	$(noinst_libknot_la_HEADERS)
 
 libknot_int_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
 libknot_int_la_CFLAGS = $(AM_CFLAGS) -fvisibility=default
 libknot_int_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_int_VERSION_INFO) $(lmdb_LIBS)
 
-libknot_yparser_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
-libknot_yparser_la_CFLAGS = $(AM_CFLAGS)
-libknot_yparser_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_yparser_VERSION_INFO)
-libknot_yparser_la_LIBADD  = libknot-int.la libknot.la
-
-libknot_la_CPPFLAGS = $(AM_CPPFLAGS)
+libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
+libknot_la_CFLAGS = $(AM_CFLAGS)
 libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO)
 libknot_la_LIBADD  = libknot-int.la dnssec/libdnssec.la zscanner/libzscanner.la
 
 # pkg-config
-pkgconfig_DATA = libknot.pc libknot-int.pc libknot-yparser.pc
+pkgconfig_DATA = libknot.pc libknot-int.pc
 
 if !HAVE_LMDB
 libknot_int_la_SOURCES +=			\
@@ -342,9 +335,9 @@ libknotd_la_CPPFLAGS  = $(AM_CPPFLAGS) $(systemd_CFLAGS) $(liburcu_CFLAGS)
 libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS) $(liburcu_LIBS)
 libknotd_la_LIBADD = libknot.la
 
-knotd_LDADD = libknotd.la libknot-yparser.la
-knotc_LDADD = libknotd.la libknot-yparser.la
-knot1to2_LDADD = libknot-int.la
+knotd_LDADD = libknotd.la
+knotc_LDADD = libknotd.la
+knot1to2_LDADD = libknot.la libknot-int.la
 
 ####################################
 # Optional Knot DNS Daemon modules #
@@ -362,7 +355,6 @@ if HAVE_ROSEDB
 libknotd_la_SOURCES +=				\
 	knot/modules/rosedb.c			\
 	knot/modules/rosedb.h
-libknotd_la_LIBADD += libknot-yparser.la
 endif # HAVE_ROSEDB
 
 # Create storage and run-time directories

src/libknot-yparser.pc.in

-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libknot-yparser
-Description: Knot DNS YParser library
-URL: https://www.knot-dns.cz
-Version: @PACKAGE_VERSION@
-Requires: libknot-int = @PACKAGE_VERSION@, libknot = @PACKAGE_VERSION@
-Libs: -L${libdir} -lknot -lknot-int
-Cflags: -I${includedir}

tests/Makefile.am

@@ -10,8 +10,7 @@ AM_LDFLAGS = \
 LDADD = \
 	$(top_builddir)/libtap/libtap.a \
 	$(top_builddir)/src/libknot-int.la \
-	$(top_builddir)/src/libknotd.la \
-	$(top_builddir)/src/libknot-yparser.la
+	$(top_builddir)/src/libknotd.la
 
 check_PROGRAMS = \
 	acl				\