From: Alexander Bokovoy Date: Fri, 25 May 2012 15:45:17 +0000 (+0300) Subject: dns_hosts_file: move to a separate subsystem X-Git-Tag: samba-4.0.0beta1~223 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=518484af8d4960b483e40fbb244e284532efd267 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 Autobuild-Date: Fri May 25 22:22:44 CEST 2012 on sn-devel-104 --- diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build index 15fb62016da..513060d2f02 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 03025ad176f..421dd6dca26 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 a8c239c10d1..faf818ef536 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',