summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-05-25 18:45:17 +0300
committerAlexander Bokovoy <ab@samba.org>2012-05-25 22:22:44 +0200
commit518484af8d4960b483e40fbb244e284532efd267 (patch)
tree28fb9bdf422c65dd9d5edc8b1559ea42a20d6313
parent337353bd3c752a41b49381486b07fe91634e6c22 (diff)
downloadsamba-518484af8d4960b483e40fbb244e284532efd267.tar.gz
samba-518484af8d4960b483e40fbb244e284532efd267.tar.bz2
samba-518484af8d4960b483e40fbb244e284532efd267.zip
dns_hosts_file: move to a separate subsystem
After discussion with Kai move dns_hosts_file to a separate subsystem and merge it into libaddns private library for s3/s4 client use. Also remove dependency in libcli/nbt, the code from libcli/dns subsystems is not used there at all. Autobuild-User: Alexander Bokovoy <ab@samba.org> Autobuild-Date: Fri May 25 22:22:44 CEST 2012 on sn-devel-104
-rwxr-xr-xlib/addns/wscript_build2
-rwxr-xr-xlibcli/dns/wscript_build12
-rwxr-xr-xlibcli/nbt/wscript_build2
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index 15fb62016d..513060d2f0 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='clidns samba-util gssapi uuid resolv',
+ public_deps='dnshostsfile samba-util gssapi uuid resolv',
private_library=True,
vars=locals())
diff --git a/libcli/dns/wscript_build b/libcli/dns/wscript_build
index 03025ad176..421dd6dca2 100755
--- a/libcli/dns/wscript_build
+++ b/libcli/dns/wscript_build
@@ -1,7 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('clidns',
- source='dns.c dns_hosts_file.c',
- public_deps='LIBTSOCKET tevent-util',
- private_library=True,
- vars=locals())
+bld.SAMBA_SUBSYSTEM('clidns',
+ source='dns.c',
+ public_deps='LIBTSOCKET tevent-util')
+
+bld.SAMBA_SUBSYSTEM('dnshostsfile',
+ source='dns_hosts_file.c',
+ public_deps='samba-util errors')
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index a8c239c10d..faf818ef53 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='clidns replace talloc'
+ deps='replace talloc'
)
bld.SAMBA_LIBRARY('cli-nbt',