summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/deps.mak7
-rw-r--r--src/clients/deps-exe/s6-dnsip4-filter3
-rw-r--r--src/clients/deps-exe/s6-dnsip6-filter3
-rw-r--r--src/clients/deps-exe/s6-dnsname-filter2
-rw-r--r--src/clients/deps-lib/s6dnsgenericfilter2
5 files changed, 8 insertions, 9 deletions
diff --git a/package/deps.mak b/package/deps.mak
index 50e5272..ad08056 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -130,14 +130,13 @@ 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
-libs6dnsgenericfilter.a: src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o
s6-dnsip4: src/clients/s6-dnsip4.o -ls6dns -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
-s6-dnsip4-filter: src/clients/s6-dnsip4-filter.o libs6dnsgenericfilter.a -lskadns -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 libs6dnsgenericfilter.a -lskadns -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 libs6dnsgenericfilter.a -lskadns -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}
diff --git a/src/clients/deps-exe/s6-dnsip4-filter b/src/clients/deps-exe/s6-dnsip4-filter
index 2c61392..cd2ffc4 100644
--- a/src/clients/deps-exe/s6-dnsip4-filter
+++ b/src/clients/deps-exe/s6-dnsip4-filter
@@ -1,4 +1,5 @@
-libs6dnsgenericfilter.a
+s6dns_generic_filter_main.o
+s6dns_namescanner.o
-lskadns
-ls6dns
-lskarnet
diff --git a/src/clients/deps-exe/s6-dnsip6-filter b/src/clients/deps-exe/s6-dnsip6-filter
index 2c61392..cd2ffc4 100644
--- a/src/clients/deps-exe/s6-dnsip6-filter
+++ b/src/clients/deps-exe/s6-dnsip6-filter
@@ -1,4 +1,5 @@
-libs6dnsgenericfilter.a
+s6dns_generic_filter_main.o
+s6dns_namescanner.o
-lskadns
-ls6dns
-lskarnet
diff --git a/src/clients/deps-exe/s6-dnsname-filter b/src/clients/deps-exe/s6-dnsname-filter
index 2c61392..033d269 100644
--- a/src/clients/deps-exe/s6-dnsname-filter
+++ b/src/clients/deps-exe/s6-dnsname-filter
@@ -1,4 +1,4 @@
-libs6dnsgenericfilter.a
+s6dns_generic_filter_main.o
-lskadns
-ls6dns
-lskarnet
diff --git a/src/clients/deps-lib/s6dnsgenericfilter b/src/clients/deps-lib/s6dnsgenericfilter
deleted file mode 100644
index 2d5eee8..0000000
--- a/src/clients/deps-lib/s6dnsgenericfilter
+++ /dev/null
@@ -1,2 +0,0 @@
-s6dns_generic_filter_main.o
-s6dns_namescanner.o