summaryrefslogtreecommitdiff
path: root/source3/build
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-09 15:56:20 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 16:46:41 +1100
commitc8b2b109760b366bee6dcf7c6c306936d271f508 (patch)
treef09769354164d60db9e0b237c9a8c4e0028aef2f /source3/build
parente92922308b5636d1b23fa44f1f8aa50413d48d77 (diff)
downloadsamba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.gz
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.bz2
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.zip
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 <abartlet@samba.org>
Diffstat (limited to 'source3/build')
-rw-r--r--source3/build/wscript4
1 files changed, 2 insertions, 2 deletions
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)