diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /wscript_build | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'wscript_build')
| -rw-r--r-- | wscript_build | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/wscript_build b/wscript_build index d955f90dc2..aa37c4bbc7 100644 --- a/wscript_build +++ b/wscript_build @@ -27,17 +27,19 @@ 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) +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('lib/ccan') +bld.RECURSE('lib/tdb_compat') bld.RECURSE('source4/lib/ldb') -bld.RECURSE('source4/dynconfig') +bld.RECURSE('dynconfig') bld.RECURSE('lib/util/charset') bld.RECURSE('source4/scripting/python') bld.RECURSE('source4/param') @@ -49,6 +51,7 @@ 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') @@ -93,6 +96,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') @@ -117,12 +121,11 @@ bld.RECURSE('source4/scripting') bld.RECURSE('pidl') bld.RECURSE('lib') bld.RECURSE('libds/common') -if bld.env.enable_s3build: - bld.RECURSE('source3') +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") +bld.INSTALL_DIRS("", "${LOCKDIR} ${STATEDIR} ${CACHEDIR} ${SWATDIR} ${SYSCONFDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging ${CODEPAGEDIR} ${LOGFILEBASE} ${SETUPDIR}") bld.SYMBOL_CHECK() |