diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 10:36:11 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:09 +0100 |
| commit | ba52f83a3f83e029cf01a36a8849b663cb1cb166 (patch) | |
| tree | 29ed140fb6f8e9c4bf9aeec5e94a332e957ef79f /source3 | |
| parent | 9aa85b6e30a226cf7f1d811d2c7742d2eb308417 (diff) | |
| download | samba-ba52f83a3f83e029cf01a36a8849b663cb1cb166.tar.gz samba-ba52f83a3f83e029cf01a36a8849b663cb1cb166.tar.bz2 samba-ba52f83a3f83e029cf01a36a8849b663cb1cb166.zip | |
s3-waf: renamed samba-util to samba-util3
also added alias samba-util when not using a toplevel build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript_build | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index a93dceb52d..23a835b9d1 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -806,7 +806,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('LIBS', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util CHARSET UTIL_TDB SAMBA_VERSION', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET UTIL_TDB SAMBA_VERSION', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', @@ -994,7 +994,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET', public_deps='ICONV_WRAPPER CODEPOINTS', deps='DYNCONFIG') -bld.SAMBA3_SUBSYSTEM('samba-util', +bld.SAMBA3_SUBSYSTEM('samba-util3', source=UTIL_SRC, deps='talloc CHARSET LIBCRYPTO', vars=locals()) @@ -1343,6 +1343,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3') bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') + bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3') |