From ba52f83a3f83e029cf01a36a8849b663cb1cb166 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 10:36:11 +1100 Subject: s3-waf: renamed samba-util to samba-util3 also added alias samba-util when not using a toplevel build Pair-Programmed-With: Andrew Bartlett --- source3/wscript_build | 5 +++-- 1 file 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') -- cgit