Commit cedb64eb authored by Jan Včelák's avatar Jan Včelák 🚀

add libknot-int library

- libknot-int exports all symbols
- pkg-config is updated to make the change transparent
parent 060f85de
......@@ -58,6 +58,7 @@
/src/knot/conf/libknotd_la-cf-lex.c
/src/knot/conf/libknotd_la-cf-parse.c
/src/knot/conf/libknotd_la-cf-parse.h
/libknot.pc
# dnstap
/src/dnstap/Makefile
......
......@@ -7,5 +7,5 @@ Name: libknot
Description: Knot DNS library
URL: http://www.knot-dns.cz
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lknot @LIBS@
Libs: -L${libdir} -lknot -lknot-int @LIBS@
Cflags: -I${includedir}
......@@ -3,7 +3,7 @@ SUBDIRS = zscanner dnstap .
sbin_PROGRAMS = knotc knotd
bin_PROGRAMS = kdig khost knsupdate knsec3hash
lib_LTLIBRARIES = libknot.la
lib_LTLIBRARIES = libknot.la libknot-int.la
noinst_LTLIBRARIES = libknotd.la libknotus.la
# $(YACC) will generate header file
......@@ -78,13 +78,62 @@ libknotus_la_SOURCES = \
utils/common/token.c \
utils/common/token.h
# dynamic: libknot
libknot_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(RELEASE_INFO) $(VERSION_INFO)
# dynamic: libknot internal headers
nobase_libknot_int_la_HEADERS = \
libknot/internal/array-sort.h \
libknot/internal/base32hex.h \
libknot/internal/base64.h \
libknot/internal/binsearch.h \
libknot/internal/endian.h \
libknot/internal/errors.h \
libknot/internal/getline.h \
libknot/internal/heap.h \
libknot/internal/hhash.h \
libknot/internal/lists.h \
libknot/internal/macros.h \
libknot/internal/mem.h \
libknot/internal/mempattern.h \
libknot/internal/mempool.h \
libknot/internal/namedb/namedb.h \
libknot/internal/namedb/namedb_lmdb.h \
libknot/internal/namedb/namedb_trie.h \
libknot/internal/net.h \
libknot/internal/print.h \
libknot/internal/sockaddr.h \
libknot/internal/strlcat.h \
libknot/internal/strlcpy.h \
libknot/internal/tolower.h \
libknot/internal/trie/hat-trie.h \
libknot/internal/trie/murmurhash3.h \
libknot/internal/utils.h
# dynamic: libknot internal sources
libknot_int_la_SOURCES = \
libknot/internal/base32hex.c \
libknot/internal/base64.c \
libknot/internal/errors.c \
libknot/internal/getline.c \
libknot/internal/heap.c \
libknot/internal/hhash.c \
libknot/internal/lists.c \
libknot/internal/mem.c \
libknot/internal/mempattern.c \
libknot/internal/mempool.c \
libknot/internal/namedb/namedb_lmdb.c \
libknot/internal/namedb/namedb_trie.c \
libknot/internal/net.c \
libknot/internal/print.c \
libknot/internal/sockaddr.c \
libknot/internal/strlcat.c \
libknot/internal/strlcpy.c \
libknot/internal/tolower.c \
libknot/internal/trie/hat-trie.c \
libknot/internal/trie/murmurhash3.c \
libknot/internal/utils.c \
$(libknot_int_la_HEADERS)
# dynamic: libknot headers
nobase_libknot_la_HEADERS = \
nobase_libknot_la_HEADERS = \
libknot/binary.h \
libknot/consts.h \
libknot/descriptor.h \
......@@ -122,34 +171,9 @@ nobase_libknot_la_HEADERS = \
libknot/rrtype/rrsig.h \
libknot/rrtype/soa.h \
libknot/rrtype/tsig.h \
libknot/tsig-op.h \
libknot/internal/array-sort.h \
libknot/internal/base32hex.h \
libknot/internal/base64.h \
libknot/internal/binsearch.h \
libknot/internal/endian.h \
libknot/internal/errors.h \
libknot/internal/getline.h \
libknot/internal/heap.h \
libknot/internal/hhash.h \
libknot/internal/lists.h \
libknot/internal/macros.h \
libknot/internal/mem.h \
libknot/internal/mempattern.h \
libknot/internal/mempool.h \
libknot/internal/namedb/namedb.h \
libknot/internal/namedb/namedb_lmdb.h \
libknot/internal/namedb/namedb_trie.h \
libknot/internal/net.h \
libknot/internal/print.h \
libknot/internal/sockaddr.h \
libknot/internal/strlcat.h \
libknot/internal/strlcpy.h \
libknot/internal/tolower.h \
libknot/internal/trie/hat-trie.h \
libknot/internal/trie/murmurhash3.h \
libknot/internal/utils.h
libknot/tsig-op.h
# dynamic: libknot sources
libknot_la_SOURCES = \
libknot/binary.c \
libknot/consts.c \
......@@ -177,27 +201,6 @@ libknot_la_SOURCES = \
libknot/rrtype/opt.c \
libknot/rrtype/tsig.c \
libknot/tsig-op.c \
libknot/internal/base32hex.c \
libknot/internal/base64.c \
libknot/internal/errors.c \
libknot/internal/getline.c \
libknot/internal/heap.c \
libknot/internal/hhash.c \
libknot/internal/lists.c \
libknot/internal/mem.c \
libknot/internal/mempattern.c \
libknot/internal/mempool.c \
libknot/internal/namedb/namedb_lmdb.c \
libknot/internal/namedb/namedb_trie.c \
libknot/internal/net.c \
libknot/internal/print.c \
libknot/internal/sockaddr.c \
libknot/internal/strlcat.c \
libknot/internal/strlcpy.c \
libknot/internal/tolower.c \
libknot/internal/trie/hat-trie.c \
libknot/internal/trie/murmurhash3.c \
libknot/internal/utils.c \
$(libknot_la_HEADERS)
# static: server shared
......@@ -325,17 +328,25 @@ libknotd_la_SOURCES = \
knot/zone/zonefile.c \
knot/zone/zonefile.h
# libraries
libknot_la_LIBADD = zscanner/libzscanner.la $(systemd_LIBS) $(lmdb_LIBS)
# linking
libknot_int_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
libknot_int_la_CFLAGS = $(AM_CFLAGS) -fvisibility=default
libknot_int_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO) $(lmdb_LIBS)
libknot_la_LDFLAGS = $(AM_LDFLAGS) $(RELEASE_INFO) $(VERSION_INFO)
libknot_la_LIBADD = libknot-int.la zscanner/libzscanner.la
libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(systemd_CFLAGS)
libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS)
libknotd_la_LIBADD = libknot.la
libknotus_la_LIBADD = libknot.la
libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(lmdb_LIBS)
libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS)
libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(libidn_LIBS)
libknotus_la_LIBADD = libknot.la
# includes
libknot_ladir = $(includedir)
libknot_int_ladir = $(includedir)
# sbin programs
knotd_LDADD = libknot.la libknotd.la
......
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