diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/wscript | 19 | ||||
| -rw-r--r-- | lib/tdb/wscript | 18 | ||||
| -rw-r--r-- | lib/tevent/wscript | 25 |
3 files changed, 24 insertions, 38 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 9c6316289e..e24314b7d1 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -8,15 +8,10 @@ blddir = 'bin' import os, sys # find the buildtools directory -buildtools = 'buildtools' -while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5: - buildtools = '../' + buildtools -srcdir = os.path.dirname(buildtools) or '.' - -sys.path.insert(0, buildtools + "/wafsamba") - - -LIBREPLACE_DIR= '../replace' +srcdir = '.' +while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: + srcdir = '../' + srcdir +sys.path.insert(0, srcdir + '/buildtools/wafsamba') import sys sys.path.insert(0, srcdir+"/buildtools/wafsamba") @@ -29,10 +24,10 @@ samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc') - opt.RECURSE(LIBREPLACE_DIR) + opt.RECURSE('lib/replace') def configure(conf): - conf.RECURSE(LIBREPLACE_DIR) + conf.RECURSE('lib/replace') if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, implied_deps='replace'): @@ -45,7 +40,7 @@ def configure(conf): def build(bld): - bld.RECURSE(LIBREPLACE_DIR) + bld.RECURSE('lib/replace') if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): bld.SAMBA_LIBRARY('talloc', diff --git a/lib/tdb/wscript b/lib/tdb/wscript index a11832f985..aff395f7fc 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -8,26 +8,22 @@ blddir = 'bin' import sys, os # find the buildtools directory -buildtools = 'buildtools' -while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5: - buildtools = '../' + buildtools -srcdir = os.path.dirname(buildtools) or '.' +srcdir = '.' +while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: + srcdir = '../' + srcdir +sys.path.insert(0, srcdir + '/buildtools/wafsamba') -sys.path.insert(0, buildtools + "/wafsamba") import wafsamba, samba_dist samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools') - -LIBREPLACE_DIR= '../replace' - def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextenion='tdb') - opt.RECURSE(LIBREPLACE_DIR) + opt.RECURSE('lib/replace') def configure(conf): - conf.RECURSE(LIBREPLACE_DIR) + conf.RECURSE('lib/replace') if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, implied_deps='replace'): @@ -36,7 +32,7 @@ def configure(conf): conf.SAMBA_CONFIG_H() def build(bld): - bld.RECURSE(LIBREPLACE_DIR) + bld.RECURSE('lib/replace') COMMON_SRC = bld.SUBDIR('common', '''check.c error.c tdb.c traverse.c diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 569740e8d0..d9634f452a 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -8,29 +8,24 @@ blddir = 'bin' import sys, os # find the buildtools directory -buildtools = 'buildtools' -while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5: - buildtools = '../' + buildtools -srcdir = os.path.dirname(buildtools) or '.' - -sys.path.insert(0, buildtools + "/wafsamba") +srcdir = '.' +while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: + srcdir = '../' + srcdir +sys.path.insert(0, srcdir + '/buildtools/wafsamba') import wafsamba, samba_dist samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools') -LIBREPLACE_DIR= '../replace' -LIBTALLOC_DIR= '../talloc' - def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent') - opt.RECURSE(LIBREPLACE_DIR) - opt.RECURSE(LIBTALLOC_DIR) + opt.RECURSE('lib/replace') + opt.RECURSE('lib/talloc') def configure(conf): - conf.RECURSE(LIBREPLACE_DIR) - conf.RECURSE(LIBTALLOC_DIR) + conf.RECURSE('lib/replace') + conf.RECURSE('lib/talloc') if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION, onlyif='talloc', implied_deps='replace talloc'): @@ -42,8 +37,8 @@ def configure(conf): conf.SAMBA_CONFIG_H() def build(bld): - bld.RECURSE(LIBREPLACE_DIR) - bld.RECURSE(LIBTALLOC_DIR) + bld.RECURSE('lib/replace') + bld.RECURSE('lib/talloc') SRC = '''tevent.c tevent_debug.c tevent_fd.c tevent_immediate.c tevent_queue.c tevent_req.c tevent_select.c |