summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pl23
-rw-r--r--source4/scripting/swig/tdb.i5
2 files changed, 13 insertions, 15 deletions
diff --git a/source4/build/smb_build/makefile.pl b/source4/build/smb_build/makefile.pl
index 0952c87f64..c684b87311 100644
--- a/source4/build/smb_build/makefile.pl
+++ b/source4/build/smb_build/makefile.pl
@@ -745,24 +745,21 @@ uninstallreg:
# Swig extensions
-PYTHON_TDB_OBJ = lib/tdb/tdb.o lib/tdb/spinlock.o
-PYTHON_TDB_PICOBJ = \$(PYTHON_TDB_OBJ:.o=.po)
+PYTHON_TDB_OBJ = lib/tdb/common/tdb.o lib/tdb/common/spinlock.o
-swig: scripting/swig/python/_tdb.so
+swig: scripting/swig/_tdb.so
-swig_clean:
- -rm -f scripting/swig/python/_tdb.so scripting/swig/python/tdb.pyc \\
- scripting/swig/python/tdb.py scripting/swig/python/tdb_wrap.c \\
- scripting/swig/python/tdb_wrap.po
+swig_clean:
+ -rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \\
+ scripting/swig/tdb.py scripting/swig/tdb_wrap.c \\
+ scripting/swig/tdb_wrap.o
-scripting/swig/python/tdb.py: scripting/swig/tdb.i
+scripting/swig/tdb.py: scripting/swig/tdb.i
swig -python scripting/swig/tdb.i
- mv scripting/swig/tdb.py scripting/swig/python
- mv scripting/swig/tdb_wrap.c scripting/swig/python
-scripting/swig/python/_tdb.so: scripting/swig/python/tdb.py scripting/swig/python/tdb_wrap.po \$(PYTHON_TDB_PICOBJ)
- \$(SHLD) \$(LDSHFLAGS) -o scripting/swig/python/_tdb.so scripting/swig/python/tdb_wrap.po \\
- \$(PYTHON_TDB_PICOBJ)
+scripting/swig/_tdb.so: scripting/swig/tdb.py scripting/swig/tdb_wrap.o \$(PYTHON_TDB_OBJ)
+ \$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \\
+ \$(PYTHON_TDB_OBJ)
everything: all
diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index e645dfaf79..f4a3f53c4b 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -40,7 +40,7 @@ typedef int SIG_ATOMIC_T;
/* Include tdb headers */
-#include "tdb/tdb.h"
+#include "lib/tdb/include/tdb.h"
%}
@@ -100,7 +100,8 @@ TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode,
- tdb_log_func log_fn);
+ tdb_log_func log_fn,
+ tdb_hash_func hash_fn);
int tdb_reopen(TDB_CONTEXT *tdb);
int tdb_reopen_all(void);