X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ftools%2FMakefile.in;h=14e887cb0baf85981ce0d29e54a486a6981145d1;hb=113727ba53c91ab6f1b0880c5908eca43b89ec4e;hp=96e950326755c21fd116037347591b6113146fbd;hpb=e1b50dbf563716047c262639fa0edd208e2a62ff;p=openldap

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 96e9503267..14e887cb0b 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -1,53 +1,49 @@
+# Makefile.in for slapd tools
 # $OpenLDAP$
-## Copyright 1998-2000 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
-#
-#-----------------------------------------------------------------------------
-BUILD_LDBM = @BUILD_LDBM@
+## 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
 
 SLAP_DIR=../
-SLAPD_MODULES = @SLAPD_MODULES_LIST@
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = -lavl -lldif -lldbm -llutil -lldap_r -llber
+XLIBS = $(SLAPD_L) $(LDBM_LIBS)
 XXLIBS = $(SLAPD_LIBS) \
-	$(LDBM_LIBS) $(SECURITY_LIBS) \
-	$(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS)
+	$(LDBM_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
+SLAPI_DEP_LIBS = $(LIBS) @LIBSLAPITOOLS@ @SLAPI_LIBS@ $(MODULES_LIBS)
 
-PROGRAMS=slapadd slapcat slapindex slappasswd
+STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a
 
-# CPPFLAGS will include the defines for dynamic libs in Mingw32.
-NT_DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
-CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS)
+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 ../backend.o ../charray.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 ../syntax.o \
-		../acl.o ../phonetic.o ../attr.o ../value.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
+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 \
+		../syntax.o ../acl.o ../phonetic.o ../attr.o ../value.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 \
+		../cancel.o ../sl_malloc.o ../backover.o ../ctxcsn.o ../syncrepl.o \
+		../ldapsync.o ../sessionlog.o
 
 SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
 
@@ -58,16 +54,19 @@ build-progs: $(PROGRAMS)
 #
 # SLAP Tools
 #
-slapadd:	slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapadd.o $(SLAPOBJS) ../libbackends.a $(LIBS)
+slapadd:	slapadd.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
+	$(LTLINK) -o $@ slapadd.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+	$(SLAPI_DEP_LIBS)
 
-slapcat:	slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapcat.o $(SLAPOBJS) ../libbackends.a $(LIBS)
+slapcat:	slapcat.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
+	$(LTLINK) -o $@ slapcat.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+	$(SLAPI_DEP_LIBS)
 
-slapindex:	slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapindex.o $(SLAPOBJS) ../libbackends.a $(LIBS)
+slapindex:	slapindex.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
+	$(LTLINK) -o $@ slapindex.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+	$(SLAPI_DEP_LIBS)
 
-slappasswd:		slappasswd.o $(SLAPD_LIBDEPEND) 
+slappasswd:		slappasswd.o $(SLAPD_L) 
 	$(LTLINK) -o $@ slappasswd.o $(LIBS)
 
 clean-local: FORCE
@@ -76,12 +75,7 @@ clean-local: FORCE
 depend-local: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
-install-local: install-ldbm-$(BUILD_LDBM) \
-	install-quipu-$(BUILD_QUIPU)
-
-install-ldbm-no:
-
-install-ldbm-yes install-ldbm-mod: FORCE
+install-local: FORCE
 	-$(MKDIR) $(DESTDIR)$(sbindir)
 	@for bin in $(PROGRAMS); do \
 		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \