From b575ce6b4b09db7b8ea6b25cdee4364df8511b94 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sat, 4 Sep 2004 22:55:33 +0000 Subject: r2226: 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. (This used to be commit e6a42f7880993271f2610584182f7d47538b6747) --- source4/build/smb_build/makefile.pl | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'source4/build') 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 -- cgit