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 | |
| parent | 2ddf89a2bc3c00b71dec230f071416e594f89113 (diff) | |
| download | samba-744f9910c81cee13228165db4e46200c41c69221.tar.gz samba-744f9910c81cee13228165db4e46200c41c69221.tar.bz2 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.
| -rwxr-xr-x | lib/addns/wscript_build | 2 | ||||
| -rwxr-xr-x | libcli/dns/wscript_build | 12 | ||||
| -rwxr-xr-x | libcli/nbt/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dns_server/wscript_build | 2 | ||||
| -rw-r--r-- | utils/wscript_build | 2 |
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' ) |