tsocket: remove DGRAM support from tsocket_context

[ira/wip.git] / lib / tdb / tdb.mk

diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 025457503959b87ca15a7a68a56f9bd432de08c0..b786bdbf54006a899b4cc28a35f4320584e548a1 100644 (file)
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -7,8 +7,9 @@ ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
 TDB_SONAME = libtdb.$(SHLIBEXT).1
 TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
+TDB_STLIB = libtdb.a
 
-TDB_LIB = libtdb.a
+TDB_LIB = $(TDB_STLIB) 
 
 bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB)
        $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
@@ -30,16 +31,16 @@ test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME)
 
 clean:: 
        rm -f test.db test.tdb torture.tdb test.gdbm
-       rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT)
+       rm -f $(TDB_SONAME) $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT)
        rm -f $(ALL_PROGS) tdb.pc
 
 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)
@@ -68,10 +69,10 @@ installheaders:: installdirs
 
 installlibs:: all installdirs
        cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
-       cp libtdb.a $(TDB_SOLIB) $(DESTDIR)$(libdir)
+       cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
 
-libtdb.a: $(TDB_OBJ)
-       ar -rv libtdb.a $(TDB_OBJ)
+$(TDB_STLIB): $(TDB_OBJ)
+       ar -rv $(TDB_STLIB) $(TDB_OBJ)
 
 libtdb.$(SHLIBEXT): $(TDB_SOLIB)
        ln -fs $< $@