diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-01 12:45:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:42:03 +1100 |
| commit | 055f017b3693af95864f6595cf4ead041c389c52 (patch) | |
| tree | 9e59e56dc7dc3345722bf678027db66a75eb1062 /wscript_build | |
| parent | 83f0dc44a70ed7e49bcee3718ff17b2063b2a01e (diff) | |
| download | samba-055f017b3693af95864f6595cf4ead041c389c52.tar.gz samba-055f017b3693af95864f6595cf4ead041c389c52.tar.xz samba-055f017b3693af95864f6595cf4ead041c389c52.zip | |
build: Reduce build systems to just top level waf and autoconf
The s3-waf build system is a key component of the top level build, but
with this commit is is no longer available directly. This reduces the
number of build system combinations in master as we prepare for the
Samba 4.0 release.
Andrew Bartlett
Diffstat (limited to 'wscript_build')
| -rw-r--r-- | wscript_build | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wscript_build b/wscript_build index 4f618202244..87b78a3f77e 100644 --- a/wscript_build +++ b/wscript_build @@ -7,9 +7,6 @@ srcdir = "." import samba_version -# mark this as a top level build, for source3 rules -bld.env.toplevel_build = True -bld.env.use_intree_heimdal = True bld.env.suffix3 = "3" # create separate build groups for building the asn1 and et compiler, then @@ -33,6 +30,7 @@ bld.RECURSE('lib/replace') bld.RECURSE('lib/socket') bld.RECURSE('lib/talloc') bld.RECURSE('lib/tevent') +bld.RECURSE('lib/addns') bld.RECURSE('lib/ccan') bld.RECURSE('lib/tdb_compat') bld.RECURSE('lib/ldb') |