diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-17 20:26:03 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:34 +1000 |
| commit | 9a1cd09a10b475a2b18059a7ac6cb6915e9dfaf0 (patch) | |
| tree | 08a0cc0eb8e23d6e16a2f530724b2577a590c282 /source4 | |
| parent | 7723519cf7544382069c7f77f915ebe9fe236efe (diff) | |
| download | samba-9a1cd09a10b475a2b18059a7ac6cb6915e9dfaf0.tar.gz samba-9a1cd09a10b475a2b18059a7ac6cb6915e9dfaf0.tar.bz2 samba-9a1cd09a10b475a2b18059a7ac6cb6915e9dfaf0.zip | |
build: added ADD_CFLAGS() and started of Samba4 build
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/wscript | 4 | ||||
| -rw-r--r-- | source4/wscript | 34 |
2 files changed, 36 insertions, 2 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 1103ec6299..0c06ebbf6b 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -37,7 +37,7 @@ def build(bld): bld.SAMBA_LIBRARY('ldb', LDB_TDB_SRC + ' ' + COMMON_SRC + ' ' + MODULES_SRC, - libdeps='tdb tevent', + deps='tdb tevent', include_list='include', vnum=VERSION) @@ -45,5 +45,5 @@ def build(bld): for t in LDB_TOOLS.split(): bld.SAMBA_BINARY(t, 'tools/%s.c tools/ldbutil.c tools/cmdline.c' % t, - libdeps='ldb', + deps='ldb', syslibs='dl popt') diff --git a/source4/wscript b/source4/wscript new file mode 100644 index 0000000000..ecbcdc2159 --- /dev/null +++ b/source4/wscript @@ -0,0 +1,34 @@ +srcdir = '..' +blddir = 'bin' + +LIBREPLACE_DIR= srcdir + '/lib/replace' +LIBLDB_DIR= srcdir + '/source4/lib/ldb' + +def set_options(opt): + opt.recurse(LIBREPLACE_DIR) + opt.recurse(LIBLDB_DIR) + +def configure(conf): + conf.DEFUN('_SAMBA_BUILD_', 4) + conf.sub_config(LIBREPLACE_DIR) + conf.sub_config(LIBLDB_DIR) + + conf.DEFUN('CONFIG_H_IS_FROM_SAMBA', 1) + conf.ADD_CFLAGS('-I.. -I../lib -I../../lib -I../.. -I../include -Idefault/source4') + conf.ADD_CFLAGS('-I../../lib/socket_wrapper -I../../lib/talloc -I../../lib/replace -I../../lib/tevent') + + + conf.ADD_CFLAGS('-I../heimdal_build -I../heimdal/lib/krb5 -I../heimdal/lib/asn1 -I../heimdal/lib/com_err -I -I../heimdal/lib/hx509 -I../heimdal/lib/roken -I../heimdal/lib/hx509 -I../heimdal/lib/asn1 -I../heimdal/lib/hcrypto -I../heimdal/lib -I../heimdal/lib/hcrypto/imath -I../heimdal/lib/wind') + conf.DEFUN('HAVE_KRB5', 1) + conf.SAMBA_CONFIG_H() + +def build(bld): + bld.add_subdirs(LIBREPLACE_DIR) + bld.add_subdirs(LIBLDB_DIR) + bld.add_subdirs('dsdb') + bld.add_subdirs('smbd') + + # some of source wants include/config.h, so + # create a link from the real config.h + bld(target='include/config.h', + rule='ln -sf ../../config.h ${TGT}') |