Commit 0b0e4f60 authored by Ondřej Surý's avatar Ondřej Surý

Change libknot/internal/ and libknot/yparser/ to convenience libraries

parent b113f8de
......@@ -3,7 +3,9 @@ SUBDIRS = zscanner dnssec dnstap .
lib_LTLIBRARIES = \
libknot.la
noinst_LTLIBRARIES =
noinst_LTLIBRARIES = \
libknot-internal.la \
libknot-yparser.la
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
......@@ -51,11 +53,17 @@ nobase_libknot_la_HEADERS = \
libknot/rrtype/rrsig.h \
libknot/rrtype/soa.h \
libknot/rrtype/tsig.h \
libknot/tsig-op.h \
libknot/tsig-op.h
libknot_yparser_ladir = $(includedir)
libknot_yparser_la_HEADERS = \
libknot/yparser/yparser.h \
libknot/yparser/ypformat.h \
libknot/yparser/ypscheme.h \
libknot/yparser/yptrafo.h \
libknot/yparser/yptrafo.h
libknot_internal_ladir = $(includedir)
libknot_internal_la_HEADERS = \
libknot/internal/array-sort.h \
libknot/internal/base32hex.h \
libknot/internal/base64.h \
......@@ -108,11 +116,17 @@ libknot_la_SOURCES = \
libknot/rrtype/opt.c \
libknot/rrtype/tsig.c \
libknot/tsig-op.c \
$(nobase_libknot_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 \
$(libknot_yparser_la_HEADERS)
libknot_internal_la_SOURCES = \
libknot/internal/base32hex.c \
libknot/internal/base64.c \
libknot/internal/errcode.c \
......@@ -134,12 +148,12 @@ libknot_la_SOURCES = \
libknot/internal/trie/hat-trie.c \
libknot/internal/trie/murmurhash3.c \
libknot/internal/utils.c \
$(nobase_libknot_la_HEADERS)
$(libknot_internal_la_HEADERS)
libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
libknot_la_CFLAGS = $(AM_CFLAGS)
libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS)
libknot_la_LIBADD = dnssec/libdnssec.la zscanner/libzscanner.la
libknot_la_LIBADD = dnssec/libdnssec.la zscanner/libzscanner.la libknot-internal.la
if HAVE_LD_VERSION_SCRIPT
libknot_la_LDFLAGS += -Wl,--version-script,$(srcdir)/libknot.map
......@@ -321,12 +335,12 @@ libknotd_la_SOURCES = \
libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(systemd_CFLAGS) $(liburcu_CFLAGS)
libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS) $(liburcu_LIBS)
libknotd_la_LIBADD = libknot.la $(liburcu_LIBS)
libknotd_la_LIBADD = libknot.la libknot-yparser.la libknot-internal.la $(liburcu_LIBS)
knotd_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS)
knotd_LDADD = libknotd.la
knotd_LDADD = libknotd.la libknot.la
knotc_LDADD = libknotd.la libknot.la
knot1to2_LDADD = libknot.la
knot1to2_LDADD = libknotd.la libknot.la
####################################
# Optional Knot DNS Daemon modules #
......@@ -406,7 +420,7 @@ libknotus_la_SOURCES = \
libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS)
libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(libidn_LIBS)
libknotus_la_LIBADD = libknot.la
libknotus_la_LIBADD = libknot.la libknot-internal.la
# bin programs
kdig_LDADD = $(libidn_LIBS) libknotus.la
......
......@@ -230,200 +230,6 @@ KNOT_2.0
knot_tsig_sign;
knot_tsig_sign_next;
knot_tsig_wire_maxsize;
mm_alloc;
mm_ctx_init;
mm_ctx_mempool;
mm_free;
mm_realloc;
tsig_alg_from_name;
tsig_alg_to_dname;
tsig_alg_to_str;
tsig_create_rdata;
tsig_rdata_alg;
tsig_rdata_alg_name;
tsig_rdata_error;
tsig_rdata_fudge;
tsig_rdata_is_ok;
tsig_rdata_mac;
tsig_rdata_mac_length;
tsig_rdata_orig_id;
tsig_rdata_other_data;
tsig_rdata_other_data_length;
tsig_rdata_set_fudge;
tsig_rdata_set_mac;
tsig_rdata_set_orig_id;
tsig_rdata_set_other_data;
tsig_rdata_set_time_signed;
tsig_rdata_store_current_time;
tsig_rdata_time_signed;
tsig_rdata_tsig_timers_length;
tsig_rdata_tsig_variables_length;
tsig_wire_maxsize;
local:
*;
};
KNOT_INTERNAL_2.0
{
global:
NAMEDB_LMDB_NOTLS;
add_head;
add_tail;
add_tail_list;
base32hex_dec;
base32hex_decode;
base32hex_decode_alloc;
base32hex_enc;
base32hex_encode;
base32hex_encode_alloc;
base32hex_pad;
base64_dec;
base64_decode;
base64_decode_alloc;
base64_enc;
base64_encode;
base64_encode_alloc;
base64_pad;
hash;
hattrie_apply_rev;
hattrie_apply_rev_ahtable;
hattrie_build_index;
hattrie_clear;
hattrie_create;
hattrie_create_n;
hattrie_del;
hattrie_dup;
hattrie_find_leq;
hattrie_find_next;
hattrie_free;
hattrie_get;
hattrie_iter_begin;
hattrie_iter_finished;
hattrie_iter_free;
hattrie_iter_key;
hattrie_iter_next;
hattrie_iter_val;
hattrie_split_mid;
hattrie_tryget;
hattrie_weight;
heap_delete;
heap_delmin;
heap_find;
heap_init;
heap_insert;
hex_print;
hhash_build_index;
hhash_clear;
hhash_create;
hhash_create_mm;
hhash_del;
hhash_find;
hhash_find_leq;
hhash_find_next;
hhash_free;
hhash_indexval;
hhash_insert;
hhash_iter_begin;
hhash_iter_finished;
hhash_iter_key;
hhash_iter_next;
hhash_iter_val;
hhash_map;
init_list;
insert_node;
knot_char_table;
knot_getline;
knot_map_errno_internal;
knot_memdup;
knot_strlcat;
knot_strlcpy;
list_dup;
list_size;
lookup_by_id;
lookup_by_name;
mm_alloc;
mm_ctx_init;
mm_ctx_mempool;
mm_free;
mm_realloc;
mp_alloc;
mp_alloc_internal;
mp_alloc_noalign;
mp_alloc_zero;
mp_delete;
mp_flush;
mp_grow_internal;
mp_init;
mp_new;
mp_open;
mp_realloc;
mp_realloc_zero;
mp_spread_internal;
mp_start;
mp_start_internal;
mp_start_noalign;
mp_stats;
mp_total_size;
mreserve;
namedb_lmdb_api;
namedb_trie_api;
net_bound_socket;
net_connected_socket;
net_is_connected;
net_unbound_socket;
ptrlist_add;
ptrlist_contains;
ptrlist_free;
rem_node;
short_hex_print;
sockaddr_cmp;
sockaddr_hostname;
sockaddr_len;
sockaddr_port;
sockaddr_port_set;
sockaddr_raw;
sockaddr_set;
sockaddr_set_raw;
sockaddr_tostr;
sprintf_alloc;
strcdup;
tcp_recv_msg;
tcp_send_msg;
time_diff;
txt_print;
udp_recv_msg;
udp_send_msg;
usage_dump;
wire_read_u16;
wire_read_u32;
wire_read_u48;
wire_read_u64;
wire_write_u16;
wire_write_u32;
wire_write_u48;
wire_write_u64;
xmalloc;
xrealloc;
} KNOT_2.0;
KNOT_YPARSER_2.0
{
global:
yp_addr;
yp_deinit;
yp_format_id;
yp_format_key0;
yp_format_key1;
yp_init;
yp_item_to_bin;
yp_item_to_txt;
yp_parse;
yp_scheme_check_deinit;
yp_scheme_check_init;
yp_scheme_check_parser;
yp_scheme_copy;
yp_scheme_find;
yp_scheme_free;
yp_set_input_file;
yp_set_input_string;
} KNOT_2.0;
\ No newline at end of file
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