Author: tpot Date: 2004-09-04 22:55:33 +0000 (Sat, 04 Sep 2004) New Revision: 2226
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2226&nolog=1 Log: A bunch of fixes to get python tdb module building again. I'm not sure how this can be integrated into the build system properly though. Editing makefile.pl is the wrong way to do this. Removed: branches/SAMBA_4_0/source/scripting/swig/python/ Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl branches/SAMBA_4_0/source/scripting/swig/tdb.i Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-09-04 01:57:21 UTC (rev 2225) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-09-04 22:55:33 UTC (rev 2226) @@ -745,24 +745,21 @@ # 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 Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i =================================================================== --- branches/SAMBA_4_0/source/scripting/swig/tdb.i 2004-09-04 01:57:21 UTC (rev 2225) +++ branches/SAMBA_4_0/source/scripting/swig/tdb.i 2004-09-04 22:55:33 UTC (rev 2226) @@ -40,7 +40,7 @@ /* Include tdb headers */ -#include "tdb/tdb.h" +#include "lib/tdb/include/tdb.h" %} @@ -100,7 +100,8 @@ 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);
