X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=wscript_build;h=43e69a5904260271ce897f6119594478dd1f4032;hp=de6ea986855231dba7d5cd5c4c3c464874463e2e;hb=cb227d6d1492247d8aff03807cac0b7266202a38;hpb=72e1a39effba7dca8d437c8cad009be6fb2c4506

diff --git a/wscript_build b/wscript_build
index de6ea986855..43e69a59042 100644
--- a/wscript_build
+++ b/wscript_build
@@ -7,17 +7,33 @@ 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
 # building the C from ASN1 and IDL, and finally the main build process
 bld.SETUP_BUILD_GROUPS()
 bld.AUTOCLEANUP_STALE_FILES()
 
+# enable building of public headers in the build tree
+bld.env.build_public_headers = 'include/public'
+
+# these are includes which appear in public headers, but with #ifdef conditional
+# compilation, so they are safe
+bld.env.public_headers_skip = ['param/param_proto.h', 'lib/ldb_compat.h']
+
+# force headers to use SAMBA4 rules
+bld.env.public_headers_replace = { '#if _SAMBA_BUILD_ == 4' : '#if 1 /* _SAMBA_BUILD_ == 4 */' }
+
 samba_version.load_version(bld.env)
 bld.SAMBA_MKVERSION('version.h')
 
 # bld.ENABLE_MAGIC_ORDERING()
 
 bld.RECURSE('lib/replace')
+bld.RECURSE('lib/socket')
 bld.RECURSE('lib/talloc')
 bld.RECURSE('lib/tdb')
 bld.RECURSE('lib/tevent')
@@ -33,6 +49,8 @@ bld.RECURSE('source4/cluster')
 bld.RECURSE('source4/smbd')
 bld.RECURSE('source4/libnet')
 bld.RECURSE('source4/auth')
+bld.RECURSE('auth')
+bld.RECURSE('auth/kerberos')
 bld.RECURSE('lib/iniparser/src')
 bld.RECURSE('nsswitch')
 bld.RECURSE('nsswitch/libwbclient')
@@ -77,6 +95,7 @@ bld.RECURSE('librpc')
 bld.RECURSE('source4/client')
 bld.RECURSE('source4/libcli')
 bld.RECURSE('libcli/smb')
+bld.RECURSE('libcli/util')
 bld.RECURSE('libcli/cldap')
 bld.RECURSE('lib/subunit/c')
 bld.RECURSE('source4/kdc')
@@ -90,6 +109,7 @@ bld.RECURSE('libcli/auth')
 bld.RECURSE('libcli/drsuapi')
 bld.RECURSE('libcli/echo')
 bld.RECURSE('libcli/samsync')
+bld.RECURSE('libcli/registry')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')
 bld.RECURSE('source4/heimdal_build')
@@ -99,6 +119,10 @@ bld.RECURSE('source4/setup')
 bld.RECURSE('source4/scripting')
 bld.RECURSE('pidl')
 bld.RECURSE('lib')
+bld.RECURSE('libds/common')
+bld.RECURSE('source3')
+
+bld.RECURSE('testsuite/headers')
 
 # install some extra empty directories
 bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")