diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/deps.mak | 30 | ||||
| -rw-r--r-- | package/targets.mak | 8 |
2 files changed, 23 insertions, 15 deletions
diff --git a/package/deps.mak b/package/deps.mak index 9c467a2..04b76c4 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -131,33 +131,33 @@ src/skadns/skadns_zero.o src/skadns/skadns_zero.lo: src/skadns/skadns_zero.c src src/skadns/skadnsd.o src/skadns/skadnsd.lo: src/skadns/skadnsd.c src/include/s6-dns/s6dns.h src/include/s6-dns/skadns.h s6-dnsip4: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsip4: src/clients/s6-dnsip4.o -ls6dns -lskarnet +s6-dnsip4: src/clients/s6-dnsip4.o ${LIBS6DNS} -lskarnet s6-dnsip4-filter: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsip4-filter: src/clients/s6-dnsip4-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o -lskadns -ls6dns -lskarnet +s6-dnsip4-filter: src/clients/s6-dnsip4-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet s6-dnsip6: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsip6: src/clients/s6-dnsip6.o -ls6dns -lskarnet +s6-dnsip6: src/clients/s6-dnsip6.o ${LIBS6DNS} -lskarnet s6-dnsip6-filter: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsip6-filter: src/clients/s6-dnsip6-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o -lskadns -ls6dns -lskarnet +s6-dnsip6-filter: src/clients/s6-dnsip6-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet s6-dnsmx: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsmx: src/clients/s6-dnsmx.o -ls6dns -lskarnet +s6-dnsmx: src/clients/s6-dnsmx.o ${LIBS6DNS} -lskarnet s6-dnsname: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsname: src/clients/s6-dnsname.o -ls6dns -lskarnet +s6-dnsname: src/clients/s6-dnsname.o ${LIBS6DNS} -lskarnet s6-dnsname-filter: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsname-filter: src/clients/s6-dnsname-filter.o src/clients/s6dns_generic_filter_main.o -lskadns -ls6dns -lskarnet +s6-dnsname-filter: src/clients/s6-dnsname-filter.o src/clients/s6dns_generic_filter_main.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet s6-dnsns: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsns: src/clients/s6-dnsns.o -ls6dns -lskarnet +s6-dnsns: src/clients/s6-dnsns.o ${LIBS6DNS} -lskarnet s6-dnsq: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsq: src/clients/s6-dnsq.o -ls6dns -lskarnet +s6-dnsq: src/clients/s6-dnsq.o ${LIBS6DNS} -lskarnet s6-dnsqr: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnsqr: src/clients/s6-dnsqr.o -ls6dns -lskarnet +s6-dnsqr: src/clients/s6-dnsqr.o ${LIBS6DNS} -lskarnet s6-dnsqualify: private EXTRA_LIBS := -s6-dnsqualify: src/clients/s6-dnsqualify.o -ls6dns -lskarnet +s6-dnsqualify: src/clients/s6-dnsqualify.o ${LIBS6DNS} -lskarnet s6-dnssoa: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnssoa: src/clients/s6-dnssoa.o -ls6dns -lskarnet +s6-dnssoa: src/clients/s6-dnssoa.o ${LIBS6DNS} -lskarnet s6-dnssrv: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnssrv: src/clients/s6-dnssrv.o -ls6dns -lskarnet +s6-dnssrv: src/clients/s6-dnssrv.o ${LIBS6DNS} -lskarnet s6-dnstxt: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -s6-dnstxt: src/clients/s6-dnstxt.o -ls6dns -lskarnet +s6-dnstxt: src/clients/s6-dnstxt.o ${LIBS6DNS} -lskarnet s6-randomip: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} s6-randomip: src/clients/s6-randomip.o -lskarnet libs6dns.a: src/libs6dns/s6dns_constants_error.o src/libs6dns/s6dns_constants_error_str.o src/libs6dns/s6dns_debughook_zero.o src/libs6dns/s6dns_domain_arpafromip4.o src/libs6dns/s6dns_domain_arpafromip6.o src/libs6dns/s6dns_domain_decode.o src/libs6dns/s6dns_domain_encode.o src/libs6dns/s6dns_domain_encodelist.o src/libs6dns/s6dns_domain_fromstring.o src/libs6dns/s6dns_domain_fromstring_noqualify_encode.o src/libs6dns/s6dns_domain_fromstring_qualify_encode.o src/libs6dns/s6dns_domain_noqualify.o src/libs6dns/s6dns_domain_qualify.o src/libs6dns/s6dns_domain_tostring.o src/libs6dns/s6dns_engine.o src/libs6dns/s6dns_engine_free.o src/libs6dns/s6dns_engine_freen.o src/libs6dns/s6dns_engine_here.o src/libs6dns/s6dns_engine_nextdeadline.o src/libs6dns/s6dns_engine_zero.o src/libs6dns/s6dns_fmt_domainlist.o src/libs6dns/s6dns_fmt_hinfo.o src/libs6dns/s6dns_fmt_mx.o src/libs6dns/s6dns_fmt_soa.o src/libs6dns/s6dns_fmt_srv.o src/libs6dns/s6dns_message_counts_next.o src/libs6dns/s6dns_message_counts_pack.o src/libs6dns/s6dns_message_counts_unpack.o src/libs6dns/s6dns_message_counts_zero.o src/libs6dns/s6dns_message_get_domain.o src/libs6dns/s6dns_message_get_domain_internal.o src/libs6dns/s6dns_message_get_hinfo.o src/libs6dns/s6dns_message_get_string.o src/libs6dns/s6dns_message_get_string_internal.o src/libs6dns/s6dns_message_get_strings.o src/libs6dns/s6dns_message_get_mx.o src/libs6dns/s6dns_message_get_soa.o src/libs6dns/s6dns_message_get_srv.o src/libs6dns/s6dns_message_header_pack.o src/libs6dns/s6dns_message_header_unpack.o src/libs6dns/s6dns_message_header_zero.o src/libs6dns/s6dns_message_parse_answer_aaaa.o src/libs6dns/s6dns_message_parse_answer_a.o src/libs6dns/s6dns_message_parse_answer_domain.o src/libs6dns/s6dns_message_parse_answer_hinfo.o src/libs6dns/s6dns_message_parse_answer_mx.o src/libs6dns/s6dns_message_parse_answer_soa.o src/libs6dns/s6dns_message_parse_answer_srv.o src/libs6dns/s6dns_message_parse_answer_strings.o src/libs6dns/s6dns_message_parse.o src/libs6dns/s6dns_message_parse_getrr.o src/libs6dns/s6dns_message_parse_init.o src/libs6dns/s6dns_message_parse_next.o src/libs6dns/s6dns_message_parse_skipqd.o src/libs6dns/s6dns_rci_free.o src/libs6dns/s6dns_rci_here.o src/libs6dns/s6dns_rci_init.o src/libs6dns/s6dns_rci_zero.o src/libs6dns/s6dns_resolve_core.o src/libs6dns/s6dns_resolve_parse.o src/libs6dns/s6dns_resolven_loop.o src/libs6dns/s6dns_resolven_parse.o src/libs6dns/s6dns_resolve_dpag.o src/libs6dns/s6dns_resolve_mpag.o src/libs6dns/s6dns_resolve_name4.o src/libs6dns/s6dns_resolve_name6.o src/libs6dns/s6dns_resolvenoq.o src/libs6dns/s6dns_resolveq.o src/libs6dns/s6dns_resolvenoq_aaaaa.o src/libs6dns/s6dns_resolveq_aaaaa.o src/libs6dns/s6dns_analyze_packet.o src/libs6dns/s6dns_analyze_qtype_parse.o src/libs6dns/s6dns_analyze_record.o src/libs6dns/s6dns_analyze_record_a.o src/libs6dns/s6dns_analyze_record_aaaa.o src/libs6dns/s6dns_analyze_record_hinfo.o src/libs6dns/s6dns_analyze_record_mx.o src/libs6dns/s6dns_analyze_record_soa.o src/libs6dns/s6dns_analyze_record_srv.o src/libs6dns/s6dns_analyze_record_domain.o src/libs6dns/s6dns_analyze_record_strings.o src/libs6dns/s6dns_analyze_record_unknown.o src/libs6dns/s6dns_analyze_rtypetable.o src/libs6dns/s6dns_debug_dumpdt_stdout.o src/libs6dns/s6dns_debug_dumpdt_stderr.o src/libs6dns/s6dns_debug_dumpdt_post_recv.o src/libs6dns/s6dns_debug_dumpdt_pre_send.o src/libs6dns/s6dns_debug_dumpdt_post_send.o @@ -165,4 +165,4 @@ libs6dns.so: src/libs6dns/s6dns_constants_error.lo src/libs6dns/s6dns_constants libskadns.a: src/skadns/skadns_cancel.o src/skadns/skadns_end.o src/skadns/skadns_packet.o src/skadns/skadns_packetlen.o src/skadns/skadns_release.o src/skadns/skadns_send.o src/skadns/skadns_start.o src/skadns/skadns_startf.o src/skadns/skadns_update.o src/skadns/skadns_zero.o libskadns.so: src/skadns/skadns_cancel.lo src/skadns/skadns_end.lo src/skadns/skadns_packet.lo src/skadns/skadns_packetlen.lo src/skadns/skadns_release.lo src/skadns/skadns_send.lo src/skadns/skadns_start.lo src/skadns/skadns_startf.lo src/skadns/skadns_update.lo src/skadns/skadns_zero.lo skadnsd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -skadnsd: src/skadns/skadnsd.o -ls6dns -lskarnet +skadnsd: src/skadns/skadnsd.o ${LIBS6DNS} -lskarnet diff --git a/package/targets.mak b/package/targets.mak index 78af02f..10f2e06 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -18,6 +18,14 @@ s6-dnsqr LIBEXEC_TARGETS := +ifdef DO_ALLSTATIC +LIBS6DNS := libs6dns.a +LIBSKADNS := libskadns.a +else +LIBS6DNS := libs6dns.so +LIBSKADNS := libskadns.so +endif + ifdef DO_SHARED SHARED_LIBS := libs6dns.so libskadns.so endif |