summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/addns/wscript_build2
-rwxr-xr-xlibcli/dns/wscript_build12
-rwxr-xr-xlibcli/nbt/wscript_build2
-rw-r--r--source4/dns_server/wscript_build2
-rw-r--r--utils/wscript_build2
5 files changed, 9 insertions, 11 deletions
diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index f1bab053c3..15fb62016d 100755
--- a/lib/addns/wscript_build
+++ b/lib/addns/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_LIBRARY('addns',
source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c',
- public_deps='DNS_HOSTS_FILE samba-util gssapi uuid resolv',
+ public_deps='clidns samba-util gssapi uuid resolv',
private_library=True,
vars=locals())
diff --git a/libcli/dns/wscript_build b/libcli/dns/wscript_build
index fab872712f..03025ad176 100755
--- a/libcli/dns/wscript_build
+++ b/libcli/dns/wscript_build
@@ -1,9 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('LIBCLI_DNS',
- source='dns.c',
- deps='LIBTSOCKET tevent-util')
-
-bld.SAMBA_SUBSYSTEM('DNS_HOSTS_FILE',
- source='dns_hosts_file.c',
- deps='samba-util errors')
+bld.SAMBA_LIBRARY('clidns',
+ source='dns.c dns_hosts_file.c',
+ public_deps='LIBTSOCKET tevent-util',
+ private_library=True,
+ vars=locals())
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 55867bae91..a8c239c10d 100755
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
bld.SAMBA_SUBSYSTEM('lmhosts',
source='lmhosts.c',
- deps='DNS_HOSTS_FILE replace talloc'
+ deps='clidns replace talloc'
)
bld.SAMBA_LIBRARY('cli-nbt',
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 960aefc3cb..c541d08d55 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('service_dns',
source='dns_server.c dns_query.c dns_update.c dns_utils.c',
subsystem='service',
init_function='server_service_dns_init',
- deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba LIBCLI_DNS',
+ deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba clidns',
local_include=False,
internal_module=False,
enabled=bld.AD_DC_BUILD_IS_ENABLED()
diff --git a/utils/wscript_build b/utils/wscript_build
index 3c22ad27ae..bb13bc78c3 100644
--- a/utils/wscript_build
+++ b/utils/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_BINARY('samba-dig',
source='samba-dig.c',
- deps='samba-util NDR_DNS tevent LIBCLI_DNS'
+ deps='samba-util NDR_DNS tevent clidns'
)