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

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index d303ad9a2b..14e887cb0b 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -1,154 +1,84 @@
+# 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@
-BUILD_QUIPU = @BUILD_QUIPU@
+## 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
-XXLIBS = $(QUIPU_LIBS) $(SLAPD_LIBS) \
-	$(LDBM_LIBS) $(SECURITY_LIBS) \
-	$(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
+XLIBS = $(SLAPD_L) $(LDBM_LIBS)
+XXLIBS = $(SLAPD_LIBS) \
+	$(LDBM_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
+SLAPI_DEP_LIBS = $(LIBS) @LIBSLAPITOOLS@ @SLAPI_LIBS@ $(MODULES_LIBS)
 
-PROGRAMS=ldif slappasswd slapadd slapcat slapindex
-LDBMPROGRAMS=centipede sizecount
-QUIPUPROGRAMS=chlog2replog edb2ldif
+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 = ldif.c mimic.c slapcommon.c slapadd.c slapcat.c slapindex.c
+SRCS = mimic.c slapcommon.c \
+	slapadd.c slapcat.c slapindex.c slappasswd.c
 
-XSRCS = edb2-vers.c
-
-# LDBMSRCS = centipede.c sizecount.c
-LDBMSRCS =
-
-QUIPUSRCS	= edb2ldif.c ldapsyntax.c chlog2replog.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
+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
 
-EDB2LDIFSRCS    = edb2ldif.c ldapsyntax.c
-EDB2LDIFOBJS    = edb2ldif.o ldapsyntax.o
-
-UNIX_PRGS = build-ldbm build-quipu
-
-all-local: build-progs $(@PLAT@_PRGS)
+all-local: build-progs
 
 build-progs: $(PROGRAMS)
 
-build-ldbm: ldbm-tools-$(BUILD_LDBM)
-ldbm-tools-no:
-	@echo "run configure with --enable-ldbm to build LDBM tools"
-
-ldbm-tools-yes ldbm-tools-mod: $(LDBMPROGRAMS)
-
-build-quipu: quipu-tools-$(BUILD_QUIPU)
-quipu-tools-no:
-	@echo "run configure with --enable-quipu to build QUIPU tools"
-
-quipu-tools-yes quipu-tools-mod: $(QUIPUPROGRAMS)
-
 #
 # SLAP Tools
 #
-slapadd:	slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapadd.o $(SLAPOBJS) ../libbackends.a $(LIBS)
-
-slapcat:	slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapcat.o $(SLAPOBJS) ../libbackends.a $(LIBS)
+slapadd:	slapadd.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
+	$(LTLINK) -o $@ slapadd.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+	$(SLAPI_DEP_LIBS)
 
-slapindex:	slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ slapindex.o $(SLAPOBJS) ../libbackends.a $(LIBS)
+slapcat:	slapcat.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
+	$(LTLINK) -o $@ slapcat.o $(SLAPOBJS) $(STATIC_DEPENDS) \
+	$(SLAPI_DEP_LIBS)
 
-ldif:		ldif.o $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ ldif.o $(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)
 
-#
-# LDBM Specific Tools
-#	(deprecated)
-centipede:	centipede.o $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ centipede.o $(LIBS)
-
-sizecount:	sizecount.o ../phonetic.o ../ch_malloc.o $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o $(LIBS)
-
-#
-# QUIPU Specific Tools
-#
-edb2ldif:	edb2-vers.o
-	$(CC) $(LDFLAGS) -o $@ $(EDB2LDIFOBJS) edb2-vers.o $(LIBS)
-
-edb2-vers.c: $(EDB2LDIFOBJS)
-	@-$(RM) $@
-	$(MKVERSION) ebd2ldif > $@
-
-chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o $(SLAPD_LIBDEPEND) 
-	$(LTLINK) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o $(LIBS)
-
 clean-local: FORCE
-	$(RM) $(PROGRAMS) $(LDBMPROGRAMS) $(QUIPUPROGRAMS) \
-		$(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe
+	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe
 
 depend-local: FORCE
-	DEPEND_LDBM= ; DEPEND_QUIPU= ; \
-	if [ "$(BUILD_LDBM)" != "no" ]; then \
-		DEPEND_LDBM="$(LDBMSRCS)"; \
-	fi; \
-	if [ "$(BUILD_QUIPU)" != "no" ]; then \
-		DEPEND_QUIPU="$(QUIPUINCLUDEFLAG) $(QUIPUSRCS)"; \
-	fi; \
-	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $$DEPEND_QUIPU $$DEPEND_LDBM
-
-install-local: install-ldbm-$(BUILD_LDBM) \
-	 install-quipu-$(BUILD_QUIPU)
-
-install-ldbm-no install-quipu-no:
-
-install-ldbm-yes install-ldbm-mod: FORCE
-	-$(MKDIR) $(DESTDIR)$(sbindir) 
+	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
+
+install-local: FORCE
+	-$(MKDIR) $(DESTDIR)$(sbindir)
 	@for bin in $(PROGRAMS); do \
 		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
 			$$bin$(EXEEXT) $(DESTDIR)$(sbindir); \
 	done
 
-install-quipu-yes: FORCE
-	@-$(MKDIR) $(DESTDIR)$(sbindir)
-	for bin in edb2ldif chlog2replog; do \
-		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
-			$$bin $(DESTDIR)$(sbindir); \
-	done