Don't keep a samba3-specific copy of ldb, use the new common code

[abartlet/samba.git/.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 80ebf0c84b8eb8cb56049bdeafede4ba03c93330..7f710ff06435394182a3f37f2db92bbe3cff152f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1124,19 +1124,19 @@ WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ
 
 WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
 
-LDB_COMMON_OBJ=lib/ldb/common/ldb.o lib/ldb/common/ldb_ldif.o \
-          lib/ldb/common/ldb_parse.o lib/ldb/common/ldb_msg.o lib/ldb/common/ldb_utf8.o \
-          lib/ldb/common/ldb_debug.o lib/ldb/common/ldb_modules.o \
-          lib/ldb/common/ldb_dn.o lib/ldb/common/ldb_match.o lib/ldb/common/ldb_attributes.o \
-          lib/ldb/common/attrib_handlers.o lib/ldb/common/ldb_controls.o lib/ldb/common/qsort.o
+LDB_COMMON_OBJ=../lib/ldb/common/ldb.o ../lib/ldb/common/ldb_ldif.o \
+          ../lib/ldb/common/ldb_parse.o ../lib/ldb/common/ldb_msg.o ../lib/ldb/common/ldb_utf8.o \
+          ../lib/ldb/common/ldb_debug.o ../lib/ldb/common/ldb_modules.o \
+          ../lib/ldb/common/ldb_dn.o ../lib/ldb/common/ldb_match.o ../lib/ldb/common/ldb_attributes.o \
+          ../lib/ldb/common/attrib_handlers.o ../lib/ldb/common/ldb_controls.o ../lib/ldb/common/qsort.o
 
-LDB_TDB_OBJ=lib/ldb/ldb_tdb/ldb_tdb.o \
-       lib/ldb/ldb_tdb/ldb_pack.o lib/ldb/ldb_tdb/ldb_search.o lib/ldb/ldb_tdb/ldb_index.o \
-       lib/ldb/ldb_tdb/ldb_cache.o lib/ldb/ldb_tdb/ldb_tdb_wrap.o
+LDB_TDB_OBJ=../lib/ldb/ldb_tdb/ldb_tdb.o \
+       ../lib/ldb/ldb_tdb/ldb_pack.o ../lib/ldb/ldb_tdb/ldb_search.o ../lib/ldb/ldb_tdb/ldb_index.o \
+       ../lib/ldb/ldb_tdb/ldb_cache.o ../lib/ldb/ldb_tdb/ldb_tdb_wrap.o
 
-LDB_MODULES_OBJ=lib/ldb/modules/operational.o lib/ldb/modules/rdn_name.o \
-          lib/ldb/modules/objectclass.o \
-          lib/ldb/modules/paged_results.o lib/ldb/modules/sort.o lib/ldb/modules/asq.o
+LDB_MODULES_OBJ=../lib/ldb/modules/operational.o ../lib/ldb/modules/rdn_name.o \
+          ../lib/ldb/modules/objectclass.o \
+          ../lib/ldb/modules/paged_results.o ../lib/ldb/modules/sort.o ../lib/ldb/modules/asq.o
 
 # enabled in configure.in
 LDB_LDAP_OBJ=@LDBLDAP@
@@ -1146,15 +1146,15 @@ LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
 LDB_CMDLINE_OBJ = $(PARAM_OBJ) \
          $(POPT_LIB_OBJ) $(LIB_OBJ) $(LIB_DUMMY_OBJ) $(LIBSMB_ERR_OBJ0) \
          $(RPC_PARSE_OBJ1) $(SECRETS_OBJ) \
-         $(LDB_OBJ) lib/ldb/tools/cmdline.o 
+         $(LDB_OBJ) ../lib/ldb/tools/cmdline.o 
 
 
-LDBEDIT_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbedit.o
-LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbsearch.o
-LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
-LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
-LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
-LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o
+LDBEDIT_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbedit.o
+LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbsearch.o
+LDBADD_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbadd.o
+LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbdel.o
+LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbmodify.o
+LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) ../lib/ldb/tools/ldbrename.o
 
 WINBIND_KRB5_LOCATOR_OBJ1 = ../nsswitch/winbind_krb5_locator.o
 WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)