diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-04 12:21:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:05 -0500 |
| commit | 38fdde5d9bf15b10caa60ee216d278ba8d870c2e (patch) | |
| tree | f5da0712c3bd704a0af17aa6d12d8c616a2d6e1b /source4/lib/tdb | |
| parent | f6f4d868ea7d3a01ec28c6855240882911cae039 (diff) | |
| download | samba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.tar.gz samba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.tar.bz2 samba-38fdde5d9bf15b10caa60ee216d278ba8d870c2e.zip | |
r18031: Merge my replace fixes:
* libreplace can now build stand-alone
* add stub testsuite for libreplace
* make talloc/tdb/ldb use libreplace
(This used to be commit fe7ca4b1454e01a33ed0d53791ebffdd349298b4)
Diffstat (limited to 'source4/lib/tdb')
| -rw-r--r-- | source4/lib/tdb/Makefile.in | 23 | ||||
| -rw-r--r-- | source4/lib/tdb/configure.ac (renamed from source4/lib/tdb/configure.in) | 0 |
2 files changed, 13 insertions, 10 deletions
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in index 3969995db3..e68f7eb8c3 100644 --- a/source4/lib/tdb/Makefile.in +++ b/source4/lib/tdb/Makefile.in @@ -40,20 +40,23 @@ install: all cp $(srcdir)/include/tdb.h $(includedir) cp tdb.pc $(libdir)/pkgconfig -bin/tdbtest: tools/tdbtest.o $(TDB_OBJ) - $(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm +libtdb.a: $(TDB_OBJ) + ar -rv libtdb.a $(TDB_OBJ) -bin/tdbtool: tools/tdbtool.o $(TDB_OBJ) - $(CC) $(CFLAGS) -o bin/tdbtool tools/tdbtool.o $(TDB_OBJ) +bin/tdbtest: tools/tdbtest.o libtdb.a + $(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm -bin/tdbtorture: tools/tdbtorture.o $(TDB_OBJ) - $(CC) $(CFLAGS) -o bin/tdbtorture tools/tdbtorture.o $(TDB_OBJ) +bin/tdbtool: tools/tdbtool.o libtdb.a + $(CC) $(CFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb -bin/tdbdump: tools/tdbdump.o $(TDB_OBJ) - $(CC) $(CFLAGS) -o bin/tdbdump tools/tdbdump.o $(TDB_OBJ) +bin/tdbtorture: tools/tdbtorture.o libtdb.a + $(CC) $(CFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb -bin/tdbbackup: tools/tdbbackup.o $(TDB_OBJ) - $(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o $(TDB_OBJ) +bin/tdbdump: tools/tdbdump.o libtdb.a + $(CC) $(CFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb + +bin/tdbbackup: tools/tdbbackup.o libtdb.a + $(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb clean: rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm diff --git a/source4/lib/tdb/configure.in b/source4/lib/tdb/configure.ac index b067940781..b067940781 100644 --- a/source4/lib/tdb/configure.in +++ b/source4/lib/tdb/configure.ac |