allow 'all' vs. 'any' sasl-authz-policy

[openldap] / servers / slapd / tools / Makefile.in

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index c700c8816fa2b0e5864e83615b2376abe1f730d4..14e887cb0baf85981ce0d29e54a486a6981145d1 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -1,20 +1,17 @@
+# Makefile.in for slapd tools
 # $OpenLDAP$
-## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-#-----------------------------------------------------------------------------
-# Portions Copyright (c) 1995 Regents of the University of Michigan.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that this notice is preserved and that due credit is given
-# to the University of Michigan at Ann Arbor. The name of the University
-# may not be used to endorse or promote products derived from this
-# software without specific prior written permission. This software
-# is provided ``as is'' without express or implied warranty.
-#
-#       Stand alone LDAP server tools makefile
-#
-#-----------------------------------------------------------------------------
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
@@ -25,10 +22,9 @@ XLDFLAGS = $(MODULES_LDFLAGS)
 
 XLIBS = $(SLAPD_L) $(LDBM_LIBS)
 XXLIBS = $(SLAPD_LIBS) \
-       $(LDBM_LIBS) $(SECURITY_LIBS) \
-       $(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) \
-       $(SLAPI_LIBS) ../libslapi.a
+       $(LDBM_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
+SLAPI_DEP_LIBS = $(LIBS) @LIBSLAPITOOLS@ @SLAPI_LIBS@ $(MODULES_LIBS)
 
 STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a
 
@@ -37,7 +33,7 @@ PROGRAMS=slapadd slapcat slapindex slappasswd
 SRCS = mimic.c slapcommon.c \
        slapadd.c slapcat.c slapindex.c slappasswd.c
 
-SLAPD_OBJS = ../config.o ../ch_malloc.o ../cr.o ../backend.o \
+SLAPD_OBJS = ../globals.o ../config.o ../ch_malloc.o ../cr.o ../backend.o \
                ../module.o ../aclparse.o ../filterentry.o ../schema.o \
                ../schema_check.o ../schema_init.o ../schema_prep.o \
                ../schemaparse.o ../ad.o ../at.o ../mr.o ../oc.o \
@@ -45,7 +41,9 @@ SLAPD_OBJS = ../config.o ../ch_malloc.o ../cr.o ../backend.o \
                ../entry.o ../dn.o ../filter.o ../str2filter.o ../ava.o \
                ../init.o ../controls.o ../kerberos.o ../passwd.o \
                ../index.o ../extended.o ../starttls.o ../sets.o ../mra.o \
-               ../referral.o ../backglue.o ../oidm.o ../mods.o ../operation.o
+               ../referral.o ../backglue.o ../oidm.o ../mods.o ../operation.o \
+               ../cancel.o ../sl_malloc.o ../backover.o ../ctxcsn.o ../syncrepl.o \
+               ../ldapsync.o ../sessionlog.o
 
 SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
 
@@ -57,13 +55,16 @@ build-progs: $(PROGRAMS)
 # SLAP Tools
 #
 slapadd:       slapadd.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapadd.o $(SLAPOBJS) $(STATIC_DEPENDS) $(LIBS)
+       $(LTLINK) -o $@ slapadd.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+       $(SLAPI_DEP_LIBS)
 
 slapcat:       slapcat.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapcat.o $(SLAPOBJS) $(STATIC_DEPENDS) $(LIBS)
+       $(LTLINK) -o $@ slapcat.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+       $(SLAPI_DEP_LIBS)
 
 slapindex:     slapindex.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) $(STATIC_DEPENDS) $(LIBS)
+       $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+       $(SLAPI_DEP_LIBS)
 
 slappasswd:            slappasswd.o $(SLAPD_L) 
        $(LTLINK) -o $@ slappasswd.o $(LIBS)