Update gen-deps.sh and deps.mak

2 files changed, 38 insertions, 16 deletions

diff --git a/package/deps.mak b/package/deps.mak
index ad08056..5c12f96 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -130,22 +130,38 @@ src/skadns/skadns_update.o src/skadns/skadns_update.lo: src/skadns/skadns_update
 src/skadns/skadns_zero.o src/skadns/skadns_zero.lo: src/skadns/skadns_zero.c src/include/s6-dns/skadns.h
 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: src/clients/s6-dnsip4.o -ls6dns -lskarnet ${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 ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsip6: src/clients/s6-dnsip6.o -ls6dns -lskarnet ${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 ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsmx: src/clients/s6-dnsmx.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsname: src/clients/s6-dnsname.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsname-filter: src/clients/s6-dnsname-filter.o src/clients/s6dns_generic_filter_main.o -lskadns -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsns: src/clients/s6-dnsns.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsq: src/clients/s6-dnsq.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsqr: src/clients/s6-dnsqr.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsip4: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsip4: src/clients/s6-dnsip4.o -ls6dns -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-dnsip6: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsip6: src/clients/s6-dnsip6.o -ls6dns -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-dnsmx: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsmx: src/clients/s6-dnsmx.o -ls6dns -lskarnet
+s6-dnsname: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsname: src/clients/s6-dnsname.o -ls6dns -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-dnsns: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsns: src/clients/s6-dnsns.o -ls6dns -lskarnet
+s6-dnsq: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsq: src/clients/s6-dnsq.o -ls6dns -lskarnet
+s6-dnsqr: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsqr: src/clients/s6-dnsqr.o -ls6dns -lskarnet
+s6-dnsqualify: private EXTRA_LIBS :=
 s6-dnsqualify: src/clients/s6-dnsqualify.o -ls6dns -lskarnet
-s6-dnssoa: src/clients/s6-dnssoa.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnssrv: src/clients/s6-dnssrv.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnstxt: src/clients/s6-dnstxt.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-randomip: src/clients/s6-randomip.o -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnssoa: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnssoa: src/clients/s6-dnssoa.o -ls6dns -lskarnet
+s6-dnssrv: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnssrv: src/clients/s6-dnssrv.o -ls6dns -lskarnet
+s6-dnstxt: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnstxt: src/clients/s6-dnstxt.o -ls6dns -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
 libs6dns.so:  src/libs6dns/s6dns_constants_error.lo src/libs6dns/s6dns_constants_error_str.lo src/libs6dns/s6dns_debughook_zero.lo src/libs6dns/s6dns_domain_arpafromip4.lo src/libs6dns/s6dns_domain_arpafromip6.lo src/libs6dns/s6dns_domain_decode.lo src/libs6dns/s6dns_domain_encode.lo src/libs6dns/s6dns_domain_encodelist.lo src/libs6dns/s6dns_domain_fromstring.lo src/libs6dns/s6dns_domain_fromstring_noqualify_encode.lo src/libs6dns/s6dns_domain_fromstring_qualify_encode.lo src/libs6dns/s6dns_domain_noqualify.lo src/libs6dns/s6dns_domain_qualify.lo src/libs6dns/s6dns_domain_tostring.lo src/libs6dns/s6dns_engine.lo src/libs6dns/s6dns_engine_free.lo src/libs6dns/s6dns_engine_freen.lo src/libs6dns/s6dns_engine_here.lo src/libs6dns/s6dns_engine_nextdeadline.lo src/libs6dns/s6dns_engine_zero.lo src/libs6dns/s6dns_fmt_domainlist.lo src/libs6dns/s6dns_fmt_hinfo.lo src/libs6dns/s6dns_fmt_mx.lo src/libs6dns/s6dns_fmt_soa.lo src/libs6dns/s6dns_fmt_srv.lo src/libs6dns/s6dns_message_counts_next.lo src/libs6dns/s6dns_message_counts_pack.lo src/libs6dns/s6dns_message_counts_unpack.lo src/libs6dns/s6dns_message_counts_zero.lo src/libs6dns/s6dns_message_get_domain.lo src/libs6dns/s6dns_message_get_domain_internal.lo src/libs6dns/s6dns_message_get_hinfo.lo src/libs6dns/s6dns_message_get_string.lo src/libs6dns/s6dns_message_get_string_internal.lo src/libs6dns/s6dns_message_get_strings.lo src/libs6dns/s6dns_message_get_mx.lo src/libs6dns/s6dns_message_get_soa.lo src/libs6dns/s6dns_message_get_srv.lo src/libs6dns/s6dns_message_header_pack.lo src/libs6dns/s6dns_message_header_unpack.lo src/libs6dns/s6dns_message_header_zero.lo src/libs6dns/s6dns_message_parse_answer_aaaa.lo src/libs6dns/s6dns_message_parse_answer_a.lo src/libs6dns/s6dns_message_parse_answer_domain.lo src/libs6dns/s6dns_message_parse_answer_hinfo.lo src/libs6dns/s6dns_message_parse_answer_mx.lo src/libs6dns/s6dns_message_parse_answer_soa.lo src/libs6dns/s6dns_message_parse_answer_srv.lo src/libs6dns/s6dns_message_parse_answer_strings.lo src/libs6dns/s6dns_message_parse.lo src/libs6dns/s6dns_message_parse_getrr.lo src/libs6dns/s6dns_message_parse_init.lo src/libs6dns/s6dns_message_parse_next.lo src/libs6dns/s6dns_message_parse_skipqd.lo src/libs6dns/s6dns_rci_free.lo src/libs6dns/s6dns_rci_here.lo src/libs6dns/s6dns_rci_init.lo src/libs6dns/s6dns_rci_zero.lo src/libs6dns/s6dns_resolve_core.lo src/libs6dns/s6dns_resolve_parse.lo src/libs6dns/s6dns_resolven_loop.lo src/libs6dns/s6dns_resolven_parse.lo src/libs6dns/s6dns_resolve_dpag.lo src/libs6dns/s6dns_resolve_mpag.lo src/libs6dns/s6dns_resolve_name4.lo src/libs6dns/s6dns_resolve_name6.lo src/libs6dns/s6dns_resolvenoq.lo src/libs6dns/s6dns_resolveq.lo src/libs6dns/s6dns_resolvenoq_aaaaa.lo src/libs6dns/s6dns_resolveq_aaaaa.lo src/libs6dns/s6dns_analyze_packet.lo src/libs6dns/s6dns_analyze_qtype_parse.lo src/libs6dns/s6dns_analyze_record.lo src/libs6dns/s6dns_analyze_record_a.lo src/libs6dns/s6dns_analyze_record_aaaa.lo src/libs6dns/s6dns_analyze_record_hinfo.lo src/libs6dns/s6dns_analyze_record_mx.lo src/libs6dns/s6dns_analyze_record_soa.lo src/libs6dns/s6dns_analyze_record_srv.lo src/libs6dns/s6dns_analyze_record_domain.lo src/libs6dns/s6dns_analyze_record_strings.lo src/libs6dns/s6dns_analyze_record_unknown.lo src/libs6dns/s6dns_analyze_rtypetable.lo src/libs6dns/s6dns_debug_dumpdt_stdout.lo src/libs6dns/s6dns_debug_dumpdt_stderr.lo src/libs6dns/s6dns_debug_dumpdt_post_recv.lo src/libs6dns/s6dns_debug_dumpdt_pre_send.lo src/libs6dns/s6dns_debug_dumpdt_post_send.lo
 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
-skadnsd: src/skadns/skadnsd.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
+skadnsd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+skadnsd: src/skadns/skadnsd.o -ls6dns -lskarnet
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index af31259..66f6d3e 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -68,12 +68,18 @@ for dir in $(ls -1 src | grep -v ^include) ; do
 
   for file in $(ls -1 src/$dir/deps-exe) ; do
     deps=
+    libs=
     while read dep ; do
       if echo $dep | grep -q -- \\.o$ ; then
         dep="src/$dir/$dep"
       fi
-      deps="$deps $dep"
+      if echo $dep | grep -q ^\\\$ ; then
+        libs="$libs $dep"
+      else
+        deps="$deps $dep"
+      fi
     done < src/$dir/deps-exe/$file
+    echo "$file: private EXTRA_LIBS :=$libs"
     echo "$file: src/$dir/$file.o$deps"
   done
 done