summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-07 01:45:06 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:41 +0100
commit1cbb73f235b926a5809bbcf35f0b1ef522e11faa (patch)
treec4bb903e7abfa49730391c8d72519840f0168dcd
parente7cf933d4168fc9c9aafb57c532868162c48a70d (diff)
downloadsamba-1cbb73f235b926a5809bbcf35f0b1ef522e11faa.tar.gz
samba-1cbb73f235b926a5809bbcf35f0b1ef522e11faa.tar.bz2
samba-1cbb73f235b926a5809bbcf35f0b1ef522e11faa.zip
r25888: Attempt to fix standalone tdb build.
(This used to be commit c758db2709e6f3d8e6c3fb65f4efd3dec3518e51)
-rw-r--r--source4/lib/tdb/Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 7b48e17d2c..e1ecbb30ec 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -76,19 +76,21 @@ $(SONAME): $(SOLIB)
$(SOLIB): $(TDB_OBJ)
$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
-bin/tdbtest$(EXEEXT): tools/tdbtest.o $(SOLIB)
+TDB_LIB = libtdb.a
+
+bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
-bin/tdbtool$(EXEEXT): tools/tdbtool.o $(SOLIB)
+bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
-bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(SOLIB)
+bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
-bin/tdbdump$(EXEEXT): tools/tdbdump.o $(SOLIB)
+bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
-bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(SOLIB)
+bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
test: bin/tdbtorture$(EXEEXT)
@@ -99,7 +101,7 @@ installcheck: test install
clean:
rm -f $(ALL_PROGS) *.o *.a common/*.o tools/*.o tdb.pc
rm -f test.db test.tdb torture.tdb test.gdbm
- rm -f $(SONAME) $(SOLIB)
+ rm -f $(SONAME) $(SOLIB) libtdb.a
distclean: clean
rm -f *~ */*~