summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/Makefile.in
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-18 07:42:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:24 -0500
commited3d8091ce2b2014350a2f7f22202dde6846a130 (patch)
tree8c1d6ee74907c2c0c2e82b9476ad1db08d7a2179 /source4/lib/ldb/Makefile.in
parentd4d6d0d2e54510690fa3f868ad02625bc24e5b9d (diff)
downloadsamba-ed3d8091ce2b2014350a2f7f22202dde6846a130.tar.gz
samba-ed3d8091ce2b2014350a2f7f22202dde6846a130.tar.bz2
samba-ed3d8091ce2b2014350a2f7f22202dde6846a130.zip
r7709: - convert ldb to use popt, so that it can interact with the samba
cmdline credentials code (which will be done soon) - added a ldb_init() call, and changed ldb_connect() to take a ldb context. This allows for much better error handling in ldb_connect(), and also made the popt conversion easier - fixed up all the existing backends with the new syntax - improved error handling in *_connect() - fixed a crash bug in the new case_fold_required() code - ensured that ltdb_rename() and all ltdb_search() paths get the read lock - added a ldb_oom() macro to make it easier to report out of memory situations in ldb code (This used to be commit f648fdf187669d6d87d01dd4e786b03cd420f220)
Diffstat (limited to 'source4/lib/ldb/Makefile.in')
-rw-r--r--source4/lib/ldb/Makefile.in34
1 files changed, 17 insertions, 17 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 88935b6f3a..a633320d06 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -39,7 +39,7 @@ endif
CFLAGS = $(CFLAGS1) $(GCOV_FLAGS) @CFLAGS@
-LIB_FLAGS=-Llib -lldb $(LDAP_LIBS) $(SQLITE3_LIBS) $(GCOV_LIBS)
+LIB_FLAGS=-Llib -lldb $(LDAP_LIBS) $(SQLITE3_LIBS) $(GCOV_LIBS) @LIBS@
TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/spinlock.o
TALLOC_OBJ=$(TALLOCDIR)/talloc.o
@@ -49,7 +49,7 @@ LDB_TDB_OBJ=ldb_tdb/ldb_match.o ldb_tdb/ldb_tdb.o \
ldb_tdb/ldb_cache.o
-COMMON_OBJ=common/ldb.o common/ldb_ldif.o common/util.o \
+COMMON_OBJ=common/ldb.o common/ldb_ldif.o \
common/ldb_parse.o common/ldb_msg.o common/ldb_utf8.o \
common/ldb_debug.o common/ldb_modules.o \
common/ldb_explode_dn.o
@@ -80,26 +80,26 @@ bin:
lib/libldb.a: $(OBJS)
-bin/ldbadd: tools/ldbadd.o $(LIBS)
- $(CC) -o bin/ldbadd tools/ldbadd.o $(LIB_FLAGS)
+bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbsearch: tools/ldbsearch.o $(LIBS)
- $(CC) -o bin/ldbsearch tools/ldbsearch.o $(LIB_FLAGS)
+bin/ldbsearch: tools/ldbsearch.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbsearch tools/ldbsearch.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbdel: tools/ldbdel.o $(LIBS)
- $(CC) -o bin/ldbdel tools/ldbdel.o $(LIB_FLAGS)
+bin/ldbdel: tools/ldbdel.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbdel tools/ldbdel.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbmodify: tools/ldbmodify.o $(LIBS)
- $(CC) -o bin/ldbmodify tools/ldbmodify.o $(LIB_FLAGS)
+bin/ldbmodify: tools/ldbmodify.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbmodify tools/ldbmodify.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbedit: tools/ldbedit.o $(LIBS)
- $(CC) -o bin/ldbedit tools/ldbedit.o $(LIB_FLAGS)
+bin/ldbedit: tools/ldbedit.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbedit tools/ldbedit.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbrename: tools/ldbrename.o $(LIBS)
- $(CC) -o bin/ldbrename tools/ldbrename.o $(LIB_FLAGS)
+bin/ldbrename: tools/ldbrename.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbrename tools/ldbrename.o tools/cmdline.o $(LIB_FLAGS)
-bin/ldbtest: tools/ldbtest.o $(LIBS)
- $(CC) -o bin/ldbtest tools/ldbtest.o $(LIB_FLAGS)
+bin/ldbtest: tools/ldbtest.o tools/cmdline.o $(LIBS)
+ $(CC) -o bin/ldbtest tools/ldbtest.o tools/cmdline.o $(LIB_FLAGS)
.SUFFIXES: .1 .2 .3 .yo
@@ -126,7 +126,7 @@ distclean: clean
etags:
etags */*.[ch]
-test-tdb:
+test-tdb: $(BINS)
@echo "STARTING TDB BACKEND TEST"
tests/test-tdb.sh