diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 16:04:30 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-18 16:46:42 +1100 |
| commit | e4c2f5c474b2c294341edcce8044319a111e1e45 (patch) | |
| tree | 16fa0b86cf00d6a8ee68e17e69f9930bee715ee6 | |
| parent | 83a63baecc0b49dac5547551436f9fca2595f2f7 (diff) | |
| download | samba-e4c2f5c474b2c294341edcce8044319a111e1e45.tar.gz samba-e4c2f5c474b2c294341edcce8044319a111e1e45.tar.bz2 samba-e4c2f5c474b2c294341edcce8044319a111e1e45.zip | |
s3-waf use lib/util/wscript_build, and avoid duplicate subsystems
| -rw-r--r-- | source3/wscript_build | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index c84787bf06..8b68089731 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -742,11 +742,6 @@ bld.SAMBA3_SUBSYSTEM('LIBGPO', deps='gpext', vars=locals()) -bld.SAMBA_SUBSYSTEM('ASN1_UTIL', - source='../lib/util/asn1.c', - deps='talloc', - local_include=False) - bld.SAMBA3_SUBSYSTEM('AVAHI', source=AVAHI_SRC, deps='avahi-common avahi-client', @@ -926,20 +921,6 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', source=FNAME_UTIL_SRC, vars=locals()) -bld.SAMBA3_SUBSYSTEM('UTIL_TDB3', - source='../lib/util/util_tdb.c', - local_include=False, - public_deps='tdb talloc' - ) - -bld.SAMBA_SUBSYSTEM('UTIL_TEVENT', - source='../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c ../lib/util/tevent_werror.c', - local_include=False, - public_deps='tevent', - public_headers='../lib/util/tevent_ntstatus.h ../lib/util/tevent_unix.h ../lib/util/tevent_werror.h', - header_path=[ ('*', 'util') ], - ) - bld.SAMBA3_SUBSYSTEM('LIBNET', source=LIBNET_SRC, deps='NDR_LIBNET_JOIN', @@ -1370,7 +1351,7 @@ bld.SAMBA3_BINARY('split_tokens', bld.SAMBA3_BINARY('vlp', source=VLP_SRC, - deps='''talloc tdb PARAM_UTIL UTIL_TDB3''', + deps='''talloc tdb PARAM_UTIL UTIL_TDB''', vars=locals()) swat_files=recursive_dirlist('../swat', '../swat', '*') @@ -1397,8 +1378,10 @@ bld.RECURSE('../lib/popt') bld.RECURSE('../librpc') bld.RECURSE('../lib/smbconf') bld.RECURSE('../lib/socket_wrapper') +bld.RECURSE('../lib/uid_wrapper') bld.RECURSE('../lib/talloc') bld.RECURSE('../lib/tdb') +bld.RECURSE('../lib/util') bld.RECURSE('../lib/tevent') bld.RECURSE('../lib/tsocket') bld.RECURSE('../lib/zlib') |