Merge remote-tracking branch 'origin/mdb.master'

[openldap] / tests / progs / Makefile.in

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 39011cc1ece6ad5ddc05ff9a675bfe63e74f6d41..04ef74931609e1c0c7aa1cae15cb5079edce9c9e 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,36 +14,53 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
-               slapd-modify
+               slapd-modify slapd-bind slapd-mtread ldif-filter
 
-SRCS     = slapd-tester.c slapd-search.c slapd-read.c slapd-addel.c \
-               slapd-modrdn.c slapd-modify.c
+SRCS     = slapd-common.c \
+               slapd-tester.c slapd-search.c slapd-read.c slapd-addel.c \
+               slapd-modrdn.c slapd-modify.c slapd-bind.c slapd-mtread.c \
+               ldif-filter.c
 
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-XLIBS    = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
-XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+XLIBS    = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
+XRLIBS    = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
+XXLIBS  = $(SECURITY_LIBS) $(LUTIL_LIBS)
+RLIBS = $(XRLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
+
+
+OBJS     = slapd-common.o
 
 # build-tools: FORCE
 # $(MAKE) $(MFLAGS) load-tools
 
 # load-tools: $(PROGRAMS)
 
-slapd-tester: slapd-tester.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-tester.o $(LIBS)
+slapd-tester: slapd-tester.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-tester.o $(OBJS) $(LIBS)
+
+slapd-search: slapd-search.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-search.o $(OBJS) $(LIBS)
+
+slapd-read: slapd-read.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-read.o $(OBJS) $(LIBS)
+
+slapd-addel: slapd-addel.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-addel.o $(OBJS) $(LIBS)
+
+slapd-modrdn: slapd-modrdn.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-modrdn.o $(OBJS) $(LIBS)
 
-slapd-search: slapd-search.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-search.o $(LIBS)
+slapd-modify: slapd-modify.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-modify.o $(OBJS) $(LIBS)
 
-slapd-read: slapd-read.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-read.o $(LIBS)
+slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
+       $(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS)
 
-slapd-addel: slapd-addel.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-addel.o $(LIBS)
+ldif-filter: ldif-filter.o $(XLIBS)
+       $(LTLINK) -o $@ ldif-filter.o $(LIBS)
 
-slapd-modrdn: slapd-modrdn.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-modrdn.o $(LIBS)
+slapd-mtread: slapd-mtread.o $(OBJS) $(XRLIBS)
+       $(LTLINK) -o $@ slapd-mtread.o $(OBJS) $(RLIBS)
 
-slapd-modify: slapd-modify.o $(XLIBS)
-       $(LTLINK) -o $@ slapd-modify.o $(LIBS)