[SCM] Samba Shared Repository - branch master updated - 6704c27a780774b24bbf5170a29d634f72b1651c

[Jelmer Vernooij]

The branch, master has been updated
       via  6704c27a780774b24bbf5170a29d634f72b1651c (commit)
      from  c2872a6ba5a7012028f1b9167c61d5907b8f7d3d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6704c27a780774b24bbf5170a29d634f72b1651c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Dec 22 23:39:30 2008 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 .gitignore     |    5 +++++
 lib/tdb/tdb.mk |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 1dca1fa..773165a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -351,3 +351,8 @@ lib/tevent/Makefile
 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 0254575..72f44e7 100644
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -35,11 +35,11 @@ clean::
 
 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)


-- 
Samba Shared Repository