From c8b2b109760b366bee6dcf7c6c306936d271f508 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Feb 2011 15:56:20 +1100 Subject: s3-waf: use SAMBA3_*() build rules in source3/build this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett --- source3/build/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/build/wscript') diff --git a/source3/build/wscript b/source3/build/wscript index c6eb55fc29..70219bc10a 100644 --- a/source3/build/wscript +++ b/source3/build/wscript @@ -41,11 +41,11 @@ def configure(conf): def build(bld): cflags = dynconfig_cflags(bld) - bld.SAMBA_SUBSYSTEM('DYNCONFIG', + bld.SAMBA3_SUBSYSTEM('DYNCONFIG', '../dynconfig.c', deps='replace talloc tdb popt', cflags=cflags) - bld.SAMBA_SUBSYSTEM('LOCALE_DIR', + bld.SAMBA3_SUBSYSTEM('LOCALE_DIR', '../localedir.c', cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR) -- cgit