diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-24 11:33:09 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-24 11:57:48 +1100 |
| commit | 52fe20c3103bbdec72f95344f07dd98b0fa915ce (patch) | |
| tree | aad8ae360d3abadc016201cedb0a046ab9f7f589 | |
| parent | 94c04b10db5032d83c21ea6eb8665bf930e81a9f (diff) | |
| download | samba-52fe20c3103bbdec72f95344f07dd98b0fa915ce.tar.gz samba-52fe20c3103bbdec72f95344f07dd98b0fa915ce.tar.bz2 samba-52fe20c3103bbdec72f95344f07dd98b0fa915ce.zip | |
build: moved lmhosts.c into a common subsystem
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | libcli/nbt/wscript_build | 8 | ||||
| -rw-r--r-- | source3/wscript_build | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index 7e3047079a..6227482b58 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -6,11 +6,15 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', autoproto='nbtname.h' ) +bld.SAMBA_SUBSYSTEM('lmhosts', + source='lmhosts.c', + deps='replace') + if bld.env._SAMBA_BUILD_ == 4: bld.SAMBA_LIBRARY('cli-nbt', - source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c', - public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util', + source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c', + public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util lmhosts', private_library=True ) diff --git a/source3/wscript_build b/source3/wscript_build index c7d84a20f7..1c8c2a15e8 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -119,7 +119,7 @@ SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c passdb/machine_sid.c''' LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c - libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c + libsmb/namequery.c libsmb/conncache.c libads/dns.c libads/sitename_cache.c''' DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c' @@ -903,8 +903,9 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNMB', - source=LIBNMB_SRC, - vars=locals()) + source=LIBNMB_SRC, + deps='lmhosts', + vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNBT', source='', |