Fix standalone build of tdb python module, update ignores for standalone tdb.

diff --git a/.gitignore b/.gitignore
index 1dca1faf2165a26111a74eee3b4e4b5b113ef440..773165afb5b03a8793c1c8a24cdc9f7cc473c93c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -351,3 +351,8 @@ lib/tevent/Makefile
 lib/tevent/tevent.so
 lib/tevent/libtevent.so*
 lib/tevent/libtevent.a
 lib/tevent/tevent.so
 lib/tevent/libtevent.so*
 lib/tevent/libtevent.a

+lib/tdb/libtdb.so
+lib/tdb/tdb.so
+lib/tdb/libtdb.a
+lib/tdb/Makefile
+lib/tdb/bin

diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 025457503959b87ca15a7a68a56f9bd432de08c0..72f44e7211ec6a509b2ff2c753257d216a085651 100644 (file)
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -35,11 +35,11 @@ clean::
 
 build-python:: tdb.$(SHLIBEXT) 
 
 
 build-python:: tdb.$(SHLIBEXT) 
 

-tdb_wrap.o: $(tdbdir)/tdb_wrap.c
-       $(CC) $(PICFLAG) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
+pytdb.o: $(tdbdir)/pytdb.c
+       $(CC) $(PICFLAG) -c $(tdbdir)/pytdb.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`

 
 

-tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) tdb_wrap.o
-       $(SHLD) $(SHLD_FLAGS) -o $@ tdb_wrap.o -L. -ltdb `$(PYTHON_CONFIG) --ldflags`
+tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) pytdb.o
+       $(SHLD) $(SHLD_FLAGS) -o $@ pytdb.o -L. -ltdb `$(PYTHON_CONFIG) --ldflags`

 
 install:: installdirs installbin installheaders installlibs \
                  $(PYTHON_INSTALL_TARGET)
 
 install:: installdirs installbin installheaders installlibs \
                  $(PYTHON_INSTALL_TARGET)