ldb: Remove remaining components of independent ldb build system

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile
deleted file mode 100644 (file)
index b82723f..0000000
--- a/lib/ldb/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# simple makefile wrapper to run waf
-
-WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
-WAF_BINARY=$(PYTHON) $(WAF_BIN)
-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
-
-all:
-       $(WAF) build
-
-install:
-       $(WAF) install
-
-uninstall:
-       $(WAF) uninstall
-
-test:
-       $(WAF) test $(TEST_OPTIONS)
-
-dist:
-       touch .tmplock
-       WAFLOCK=.tmplock $(WAF) dist
-
-distcheck:
-       touch .tmplock
-       WAFLOCK=.tmplock $(WAF) distcheck
-
-clean:
-       $(WAF) clean
-
-distclean:
-       $(WAF) distclean
-
-reconfigure: configure
-       $(WAF) reconfigure
-
-show_waf_options:
-       $(WAF) --help
-
-# some compatibility make targets
-everything: all
-
-testsuite: all
-
-check: test
-
-# this should do an install as well, once install is finished
-installcheck: test
-
-etags:
-       $(WAF) etags
-
-ctags:
-       $(WAF) ctags

diff --git a/lib/ldb/configure b/lib/ldb/configure
deleted file mode 100755 (executable)
index 2ed3240..0000000
--- a/lib/ldb/configure
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-PREVPATH=$(dirname $0)
-
-if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
-       WAF=../../buildtools/bin/waf
-elif [ -f $PREVPATH/buildtools/bin/waf ]; then
-       WAF=./buildtools/bin/waf
-else
-       echo "ldb: Unable to find waf"
-       exit 1
-fi
-
-# using JOBS=1 gives maximum compatibility with
-# systems like AIX which have broken threading in python
-JOBS=1
-export JOBS
-
-# Make sure we don't have any library preloaded.
-unset LD_PRELOAD
-
-# Make sure we get stable hashes
-PYTHONHASHSEED=1
-export PYTHONHASHSEED
-
-cd . || exit 1
-$PYTHON $WAF configure "$@" || exit 1
-cd $PREVPATH

diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index d082b251e927be44e19be5682bccf4598c0b630c..808244090d30ff26b9edd36345b01827d6780b3b 100644 (file)
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -1,32 +1,14 @@
 #!/usr/bin/env python
 
-APPNAME = 'ldb'
 # For Samba 4.21.x
 VERSION = '2.10.0'
 
 import sys, os
 
-# find the buildtools directory
-top = '.'
-while not os.path.exists(top+'/buildtools') and len(top.split('/')) < 5:
-    top = top + '/..'
-sys.path.insert(0, top + '/buildtools/wafsamba')
-
-out = 'bin'
-
 from wafsamba import samba_dist, samba_utils, samba_bundled
 from waflib import Errors, Options, Logs, Context
 import shutil
 
-samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                        lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-                        third_party/popt:third_party/popt
-                        third_party/cmocka:third_party/cmocka
-                        buildtools:buildtools third_party/waf:third_party/waf''')
-
-samba_dist.DIST_FILES('''lib/util/binsearch.h:lib/util/binsearch.h
-                         lib/util/attr.h:lib/util/attr.h''')
-
 def options(opt):
     opt.BUILTIN_DEFAULT('replace')
     opt.PRIVATE_EXTENSION_DEFAULT('ldb', noextension='ldb')
@@ -522,11 +504,3 @@ def build(bld):
                          deps='cmocka ldb',
                          install=False)
 
-def dist():
-    '''makes a tarball for distribution'''
-    samba_dist.dist()
-
-def reconfigure(ctx):
-    '''reconfigure if config scripts have changed'''
-    import samba_utils
-    samba_utils.reconfigure(ctx)