diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-05-21 17:54:13 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-05-23 17:51:50 +0300 |
| commit | 744f9910c81cee13228165db4e46200c41c69221 (patch) | |
| tree | 9727931e2c7089501e211393a3095520362a131a /libcli | |
| parent | 2ddf89a2bc3c00b71dec230f071416e594f89113 (diff) | |
| download | samba-744f9910c81cee13228165db4e46200c41c69221.tar.gz samba-744f9910c81cee13228165db4e46200c41c69221.tar.xz samba-744f9910c81cee13228165db4e46200c41c69221.zip | |
libcli/dns: make 'clidns' private library out of DNS code in WAF build
After consolidating DNS resolver code to lib/addns, there is one piece
that still needs to be moved into a common DNS resolver library: DNS_HOSTS_FILE
subsystem. Unfortunately, direct move would require lib/addns to depend on
libcli/util/{ntstatus.h,werror.h} (provided by errors subsystem).
In addition, moving libcli/dns/* code to lib/addns/ would make conflicting
the dns_tkey_record struct. The conflict comes from source4/dns_server/ and is due
to use of IDL to define the struct. lib/addns/ library also provides its own definition
so we either need to keep them in sync (rewrite code in lib/addns/ a bit) or
depend on generated IDL headers.
Thus, making a private library and subsystem clidns is an intermediate step
that allows to buy some time fore refactoring.
Diffstat (limited to 'libcli')
| -rwxr-xr-x | libcli/dns/wscript_build | 12 | ||||
| -rwxr-xr-x | libcli/nbt/wscript_build | 2 |
2 files changed, 6 insertions, 8 deletions
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', |