diff options
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 1 | ||||
| -rwxr-xr-x | source4/lib/ldb/autogen.sh | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb.mk | 17 | ||||
| -rw-r--r-- | source4/lib/ldb/python.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/rules.mk | 5 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/api.py | 1 |
6 files changed, 7 insertions, 21 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index 8d95dae7ea..d97ca8bde3 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -17,7 +17,6 @@ builddir = @builddir@ sharedbuilddir = @sharedbuilddir@ INSTALLCMD = @INSTALL@ SLAPD = @SLAPD@ -SWIG = swig EXTRA_OBJ=@EXTRA_OBJ@ TESTS=test-tdb.sh @TESTS@ PACKAGE_VERSION = @PACKAGE_VERSION@ diff --git a/source4/lib/ldb/autogen.sh b/source4/lib/ldb/autogen.sh index 52fc8b63e2..e4d367dc1e 100755 --- a/source4/lib/ldb/autogen.sh +++ b/source4/lib/ldb/autogen.sh @@ -11,8 +11,6 @@ autoconf $IPATHS || exit 1 rm -rf autom4te.cache -swig -O -Wall -python -keyword ldb.i # Ignore errors, for now - echo "Now run ./configure and then make." exit 0 diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk index a7b1cb0c69..9d94434dc0 100644 --- a/source4/lib/ldb/ldb.mk +++ b/source4/lib/ldb/ldb.mk @@ -62,25 +62,20 @@ examples/ldifreader: examples/ldifreader.o $(CC) -o examples/ldifreader examples/ldifreader.o $(LIB_FLAGS) # Python bindings -build-python:: _ldb.$(SHLIBEXT) +build-python:: ldb.$(SHLIBEXT) ldb_wrap.o: $(ldbdir)/ldb_wrap.c $(CC) $(PICFLAG) -c $(ldbdir)/ldb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags` -_ldb.$(SHLIBEXT): ldb_wrap.o - $(SHLD) $(SHLD_FLAGS) -o _ldb.$(SHLIBEXT) ldb_wrap.o $(LIB_FLAGS) `$(PYTHON_CONFIG) --ldflags` +ldb.$(SHLIBEXT): ldb_wrap.o + $(SHLD) $(SHLD_FLAGS) -o ldb.$(SHLIBEXT) ldb_wrap.o $(LIB_FLAGS) `$(PYTHON_CONFIG) --ldflags` install-python:: build-python - mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` \ - $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - cp $(ldbdir)/ldb.py $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` - cp _ldb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - -install-swig:: - cp ldb.i `$(SWIG) -swiglib` + mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` + cp ldb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` check-python:: build-python LD_LIBRARY_PATH=lib PYTHONPATH=.:$(ldbdir) $(PYTHON) $(ldbdir)/tests/python/api.py clean:: - rm -f _ldb.$(SHLIBEXT) + rm -f ldb.$(SHLIBEXT) diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index cfaa93981b..a672c079a2 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -5,4 +5,4 @@ PUBLIC_DEPENDENCIES = LIBLDB LIBEVENTS PYTALLOC swig_ldb_OBJ_FILES = $(ldbsrcdir)/pyldb.o $(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)/include -$(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) +$(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_CAST_QUAL) diff --git a/source4/lib/ldb/rules.mk b/source4/lib/ldb/rules.mk index ff5dc02742..639271b76d 100644 --- a/source4/lib/ldb/rules.mk +++ b/source4/lib/ldb/rules.mk @@ -4,11 +4,6 @@ etags: ctags: ctags `find $(srcdir) -name "*.[ch]"` -.SUFFIXES: _wrap.c .i - -.i_wrap.c: - [ "$(SWIG)" = "no" ] || $(SWIG) -O -Wall -python -keyword $< - .SUFFIXES: .1 .1.xml .3 .3.xml .xml .html .c .o .c.o: diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py index 4b3501839f..6832a10bae 100755 --- a/source4/lib/ldb/tests/python/api.py +++ b/source4/lib/ldb/tests/python/api.py @@ -6,7 +6,6 @@ import os, sys import unittest # Required for the standalone LDB build -sys.path.append("swig") sys.path.append("build/lib.linux-i686-2.4") import ldb |