lib/util: charset modules do not exist any more

[amitay/samba.git] / wscript_build

diff --git a/wscript_build b/wscript_build
index dd905f8063a20cd5ec50b7d64bcf7cfe1cbd5d4a..93008a8744deea40ee541bd7286707125a14d42c 100644 (file)
--- 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
@@ -17,17 +14,28 @@ bld.env.suffix3 = "3"
 bld.SETUP_BUILD_GROUPS()
 bld.AUTOCLEANUP_STALE_FILES()
 
-samba_version.load_version(bld.env)
+# 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']
+
+samba_version.load_version(bld.env, is_install=bld.is_install)
 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')
-bld.RECURSE('source4/lib/ldb')
-bld.RECURSE('source4/dynconfig')
+bld.RECURSE('lib/addns')
+bld.RECURSE('lib/ccan')
+bld.RECURSE('lib/tdb_compat')
+bld.RECURSE('lib/ldb')
+bld.RECURSE('lib/param')
+bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
 bld.RECURSE('source4/scripting/python')
 bld.RECURSE('source4/param')
@@ -39,12 +47,13 @@ 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')
 bld.RECURSE('source4/lib/samba3')
 bld.RECURSE('source4/lib/socket')
-bld.RECURSE('source4/lib/ldb-samba')
+bld.RECURSE('lib/ldb-samba')
 bld.RECURSE('source4/lib/tls')
 bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
@@ -56,6 +65,7 @@ bld.RECURSE('lib/uid_wrapper')
 bld.RECURSE('lib/popt')
 bld.RECURSE('source4/lib/stream')
 bld.RECURSE('lib/util')
+bld.RECURSE('lib/tdb_wrap')
 bld.RECURSE('lib/tdr')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
@@ -74,15 +84,15 @@ bld.RECURSE('source4/nbt_server')
 bld.RECURSE('source4/wrepl_server')
 bld.RECURSE('source4/cldap_server')
 bld.RECURSE('source4/ntp_signd')
-bld.RECURSE('source4/samba_tool')
 bld.RECURSE('source4/utils')
 bld.RECURSE('source4/ntvfs')
 bld.RECURSE('source4/ntptr')
 bld.RECURSE('source4/torture')
 bld.RECURSE('librpc')
-bld.RECURSE('source4/client')
+bld.RECURSE('source4')
 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')
@@ -93,9 +103,12 @@ bld.RECURSE('libcli/ldap')
 bld.RECURSE('libcli/nbt')
 bld.RECURSE('libcli/netlogon')
 bld.RECURSE('libcli/auth')
+bld.RECURSE('libcli/lsarpc')
 bld.RECURSE('libcli/drsuapi')
 bld.RECURSE('libcli/echo')
+bld.RECURSE('libcli/dns')
 bld.RECURSE('libcli/samsync')
+bld.RECURSE('libcli/registry')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')
 bld.RECURSE('source4/heimdal_build')
@@ -105,10 +118,14 @@ bld.RECURSE('source4/setup')
 bld.RECURSE('source4/scripting')
 bld.RECURSE('pidl')
 bld.RECURSE('lib')
-if bld.env.enable_s3build:
-    bld.RECURSE('source3')
+bld.RECURSE('libds/common')
+bld.RECURSE('source3')
+bld.RECURSE('dfs_server')
+bld.RECURSE('file_server')
+bld.RECURSE('utils')
 
-# install some extra empty directories
-bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")
+bld.RECURSE('testsuite/headers')
+bld.RECURSE('testsuite/libsmbclient/src')
 
 bld.SYMBOL_CHECK()
+bld.DUP_SYMBOL_CHECK()