Resolves: #237040

Summary: Remove obsolete makefiles

22 files changed, 0 insertions, 2754 deletions

diff --git a/ldap/servers/plugins/Makefile b/ldap/servers/plugins/Makefile
deleted file mode 100644
index 1a4afc4b..00000000
--- a/ldap/servers/plugins/Makefile
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server and LDAP SDK libraries
-#
-
-BUILD_ROOT = ../../..
-LDAP_SRC = $(BUILD_ROOT)/ldap
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-PLUGINS = _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views _dna
-ifneq ($(ARCH), WINNT)
-ifneq ($(BRAND), redhat)
-PLUGINS += _pam_passthru
-endif
-endif
-
-all: $(PLUGINS)
-
-_utils:
-	cd shared; $(MAKE) $(MFLAGS) all
-_rever:  
-	cd rever; $(MAKE) $(MFLAGS) all
-
-_chainingdb:  
-	cd chainingdb; $(MAKE) $(MFLAGS) all
-
-_referint:  
-	cd referint; $(MAKE) $(MFLAGS) all
-
-_collation:  
-	cd collation; $(MAKE) $(MFLAGS) all
-
-_syntaxes:  
-	cd syntaxes; $(MAKE) $(MFLAGS) all
-
-_passthru:
-	cd passthru; $(MAKE) $(MFLAGS) all
-
-ifneq ($(ARCH), WINNT)
-_pam_passthru:
-	cd pam_passthru; $(MAKE) $(MFLAGS) all
-endif
-
-_uiduniq:
-	cd uiduniq; $(MAKE) $(MFLAGS) all
-
-_replication:
-	cd replication; $(MAKE) $(MFLAGS) all
-
-_acl:
-	cd acl; $(MAKE) $(MFLAGS) all
-
-_pwdstorage:
-	cd pwdstorage; $(MAKE) $(MFLAGS) all
-
-_distrib:
-	cd distrib; $(MAKE) $(MFLAGS) all
-
-_roles:
-	cd roles; $(MAKE) $(MFLAGS) all
-
-_cos:
-	cd cos; $(MAKE) $(MFLAGS) all
-
-_statechange:
-	cd statechange; $(MAKE) $(MFLAGS) all
-
-_retrocl:
-	cd retrocl; $(MAKE) $(MFLAGS) all
-
-_http:
-	cd http; $(MAKE) $(MFLAGS) all
-
-# Note: stops building/packaging presence from 7.1
-_presence:
-	cd presence; $(MAKE) $(MFLAGS) all
-
-_views:
-	cd views; $(MAKE) $(MFLAGS) all
-
-_dna:
-	cd dna; $(MAKE) $(MFLAGS) all
-
-clean: 
-	cd rever; $(MAKE) $(MFLAGS) clean
-	cd referint; $(MAKE) $(MFLAGS) clean
-	cd collation; $(MAKE) $(MFLAGS) clean
-	cd syntaxes; $(MAKE) $(MFLAGS) clean
-	cd passthru; $(MAKE) $(MFLAGS) clean
-ifneq ($(ARCH), WINNT)
-	cd pam_passthru; $(MAKE) $(MFLAGS) clean
-endif
-	cd shared; $(MAKE) $(MFLAGS) clean
-	cd uiduniq; $(MAKE) $(MFLAGS) clean
-	cd replication; $(MAKE) $(MFLAGS) clean
-	cd acl; $(MAKE) $(MFLAGS) clean
-	cd cos; $(MAKE) $(MFLAGS) clean
-	cd pwdstorage; $(MAKE) $(MFLAGS) clean
-	cd roles; $(MAKE) $(MFLAGS) clean
-	cd chainingdb; $(MAKE) $(MFLAGS) clean
-	cd distrib; $(MAKE) $(MFLAGS) clean
-	cd retrocl; $(MAKE) $(MFLAGS) clean
-	cd statechange; $(MAKE) $(MFLAGS) clean
-	cd http; $(MAKE) $(MFLAGS) clean
-	cd views; $(MAKE) $(MFLAGS) clean
-	#cd presence; $(MAKE) $(MFLAGS) clean
-	cd dna; $(MAKE) $(MFLAGS) clean
-
-veryclean:	clean
diff --git a/ldap/servers/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
deleted file mode 100644
index 53204e5e..00000000
--- a/ldap/servers/plugins/acl/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server acl-plugin.so acl plugins
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libacl
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libacl.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd -I$(ACLINC)
-
-ACL_OBJS=	acl.o acllas.o aclutil.o aclplugin.o aclparse.o acl_ext.o aclproxy.o \
-			aclinit.o aclgroup.o aclanom.o acllist.o acleffectiverights.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(ACL_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBACL_DLL_OBJ = $(addprefix $(OBJDEST)/, acldllmain.o)
-endif
-
-LIBACL=	$(addprefix $(LIBDIR)/, $(ACL_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(NSPRLINK) $(LDAP_LIBAVL) $(LDAP_SDK_LIBLDAP_DLL)
-endif
-
-# ACL plugin depends on libadminutil (through libns-httpd)
-EXTRA_LIBS_DEP += $(NSHTTPD_DEP)
-EXTRA_LIBS += $(DYN_NSHTTPD)
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBACCESS_DEP)
-EXTRA_LIBS += $(LIBACCESS)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libacl.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK) $(NSPRLINK) $(LDAP_LIBAVL) $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(DYN_NSHTTPD) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBACL)
-
-$(LIBACL): $(OBJS) $(LIBACL_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBACL_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBACL_DLL_OBJ)
-endif
-	$(RM) $(LIBACL)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
deleted file mode 100644
index bc1ef7a0..00000000
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "Chaining Backend" plugin
-#
-
-LDAP_SRC = ../../..
-
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libcb
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libcb.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-CB_OBJS= cb_temp.o cb_init.o cb_config.o cb_instance.o cb_start.o cb_search.o cb_utils.o cb_add.o cb_delete.o cb_schema.o \
-cb_acl.o cb_modify.o cb_compare.o cb_modrdn.o cb_abandon.o cb_conn_stateless.o cb_bind.o cb_unbind.o cb_monitor.o \
-cb_controls.o cb_size.o cb_test.o cb_close.o cb_cleanup.o cb_debug.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(CB_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBCB_DLL_OBJ = $(addprefix $(OBJDEST)/, cbdllmain.o)
-endif
-
-LIBCB=	$(addprefix $(LIBDIR)/, $(CB_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAP_LIBUTIL_DEP) $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(LDAP_LIBUTIL) $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
-
-endif
-
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libcb.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAP_LIBUTIL_DEP) $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(LIBUTIL)  $(LDAP_COMMON_LIBS)  $(SECURITYLINK) $(NSPRLINK) 
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBCB)
-
-$(LIBCB): $(OBJS) $(LIBCB_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBCB_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBCB_DLL_OBJ)
-endif
-	$(RM) $(LIBCB)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(OBJS):	cb.h
diff --git a/ldap/servers/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
deleted file mode 100644
index ab48c047..00000000
--- a/ldap/servers/plugins/collation/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC= ../../..
-BUILD_ROOT= ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST= $(OBJDIR)/lib/libcollation-plugin
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-INCLUDES+= -I../../slapd  -I../../../include 
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-COLLATION_OBJS= collate.o config.o orfilter.o
-
-ifeq ($(ARCH), WINNT)
-COLLATION_OBJS+= debug.o
-COLLATION_DLL_OBJ=$(addprefix $(OBJDEST)/, dllmain.o)
-DEF_FILE:=./collation.def
-EXTRA_LIBS+= $(NSPRLINK) $(LDAP_SDK_LIBLDAP_DLL) $(LIBSLAPD) 
-EXTRA_LIBS_DEP+= $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP+=$(LDAPSDK_DEP)
-endif
-
-# INCLUDES+= -I. -I$(ACLINC) -I$(BUILD_ROOT)/lib
-
-# ICU stuff
-INCLUDES+= $(ICU_INCLUDE)
-EXTRA_LIBS+=$(ICULINK) 
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS+= $(LIBSLAPDLINK) $(NSPRLINK) $(LDAPLINK)
-EXTRA_LIBS_DEP+= $(LIBSLAPD_DEP) 
-EXTRA_LIBS_DEP+=$(LDAPSDK_DEP)
-LD=ld
-endif
-
-OBJS= $(addprefix $(OBJDEST)/, $(COLLATION_OBJS)) 
-COLLATION= $(addprefix $(LIBDIR)/, $(COLLATION_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all: $(OBJDEST) $(LIBDIR) $(COLLATION)
-ifeq (0, 1)
-# Where the heck did the compiler options come from?
-	@echo ARCH=$(ARCH)
-	@echo DEBUG=$(DEBUG)
-	@echo BUILD_OPT=$(BUILD_OPT)
-	@echo CFLAGS=$(CFLAGS)
-	@echo "    MCC_DEBUG="$(MCC_DEBUG)
-	@echo "    PLATFORMCFLAGS="$(PLATFORMCFLAGS)
-	@echo "    ACFLAGS="$(ACFLAGS)
-	@echo "        EXTRACFLAGS="$(EXTRACFLAGS)
-	@echo "        UNPROTOCFLAGS="$(UNPROTOCFLAGS)
-	@echo "    SLCFLAGS="$(SLCFLAGS)
-	@echo "ALDFLAGS="$(ALDFLAGS)
-	@echo "DLL_LDFLAGS="$(DLL_LDFLAGS)
-	@echo "DLL_EXPORT_FLAGS="$(DLL_EXPORT_FLAGS)
-endif
-
-ifeq ($(ARCH), WINNT)
-$(COLLATION): $(OBJS) $(COLLATION_DLL_OBJ) $(EXTRA_LIBS_DEP) $(DEF_FILE)
-	$(LINK_DLL) $(COLLATION_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-ifeq ($(ARCH), AIX)
-$(COLLATION): $(OBJS) $(COLLATION_DLL_OBJ) $(EXTRA_LIBS_DEP)
-	$(LINK_DLL) $(COLLATION_DLL_OBJ) $(EXTRA_LIBS)
-else
-$(COLLATION): $(OBJS) $(EXTRA_LIBS_DEP)
-	$(LINK_DLL) $(EXTRA_LIBS)
-endif
-endif
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(COLLATION_DLL_OBJ)
-endif
-	$(RM) $(COLLATION)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
deleted file mode 100644
index 7653d698..00000000
--- a/ldap/servers/plugins/cos/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libcos
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./cos.def
-endif
-
-COS_OBJS =	cos.o cos_cache.o
-OBJS = $(addprefix $(OBJDEST)/, $(COS_OBJS)) 
-
-COS_DLL = libcos-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-COS_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK)  $(NSPRLINK)  $(LDAP_SDK_LIBLDAP_DLL)
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-COS=	$(addprefix $(LIBDIR)/, $(COS_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(COS)
-
-ifeq ($(ARCH), WINNT)
-$(COS): $(OBJS) $(COS_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(COS_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(COS): $(OBJS) $(COS_DLL_OBJ) 
-	$(LINK_DLL) $(COS_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(COS_DLL_OBJ)
-endif
-	$(RM) $(COS)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/dna/Makefile b/ldap/servers/plugins/dna/Makefile
deleted file mode 100644
index bacc3f0f..00000000
--- a/ldap/servers/plugins/dna/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libdna
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./dna.def
-endif
-
-DNA_OBJS =	dna.o
-OBJS = $(addprefix $(OBJDEST)/, $(DNA_OBJS)) 
-
-DNA_DLL = libdna-plugin
-
-INCLUDES += -I../http -I../../slapd  -I../../../include  
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-DNA_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK)  $(NSPRLINK)  $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-endif
-
-DNA=	$(addprefix $(LIBDIR)/, $(DNA_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(DNA)
-
-ifeq ($(ARCH), WINNT)
-$(DNA): $(OBJS) $(DNA_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(DNA_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(DNA): $(OBJS) $(DNA_DLL_OBJ) 
-	$(LINK_DLL) $(DNA_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(DNA_DLL_OBJ)
-endif
-	$(RM) $(DNA)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(LIBDIR):
-	$(MKDIR) $(LIBDIR)
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
deleted file mode 100644
index 654cf421..00000000
--- a/ldap/servers/plugins/http/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-# 
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libhttpclient
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./http.def
-endif
-
-HTTP_OBJS =	http_client.o http_impl.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(HTTP_OBJS)) 
-
-HTTP_DLL = libhttp-client-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING 
-
-ifeq ($(ARCH), WINNT)
-CFLAGS+=-D_WIN32 -DXP_WIN -DXP_WIN32
-EXTRA_LIBS_DEP +=  $(LIBSLAPD_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(NSPRLINK) $(LIBSLAPD) $(SECURITYLINK)
-HTTP_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), AIX)
-LD=ld
-EXTRA_LIBS += $(LIBSLAPD) 
-endif
-
-HTTP=	$(addprefix $(LIBDIR)/, $(HTTP_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(HTTP)
-
-ifeq ($(ARCH), WINNT)
-$(HTTP): $(OBJS) $(HTTP_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(HTTP_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(HTTP): $(OBJS) $(HTTP_DLL_OBJ) 
-	$(LINK_DLL) $(HTTP_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(HTTP_DLL_OBJ)
-endif
-	$(RM) $(HTTP)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/pam_passthru/Makefile b/ldap/servers/plugins/pam_passthru/Makefile
deleted file mode 100644
index ff846c8a..00000000
--- a/ldap/servers/plugins/pam_passthru/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "PAM Pass Through Authentication" plugin
-#
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libpam_passthru
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libpam_passthru.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-PAM_PASSTHRU_OBJS=	pam_ptimpl.o pam_ptconfig.o pam_ptdebug.o pam_ptpreop.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(PAM_PASSTHRU_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBPAM_PASSTHRU_DLL_OBJ = $(addprefix $(OBJDEST)/, pam_ptdllmain.o)
-endif
-
-LIBPAM_PASSTHRU=	$(addprefix $(LIBDIR)/, $(PAM_PASSTHRU_DLL).$(DLL_SUFFIX))
-
-EXTRA_LIBS += -lpam
-#LD += -Xlinker --no-undefined -Xlinker --no-allow-shlib-undefined
-#LD += -Xlinker --export-dynamic
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
-endif
-
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libpam_passthru.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBPAM_PASSTHRU)
-
-$(LIBPAM_PASSTHRU): $(OBJS) $(LIBPAM_PASSTHRU_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBPAM_PASSTHRU_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBPAM_PASSTHRU_DLL_OBJ)
-endif
-	$(RM) $(LIBPAM_PASSTHRU)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(OBJS):	pam_passthru.h
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
deleted file mode 100644
index 2ff72a2e..00000000
--- a/ldap/servers/plugins/passthru/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "Pass Through Authentication" plugin
-#
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libpassthru
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libpassthru.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-PASSTHRU_OBJS=	ptbind.o ptconfig.o ptconn.o ptdebug.o ptpreop.o ptutil.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(PASSTHRU_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBPASSTHRU_DLL_OBJ = $(addprefix $(OBJDEST)/, ptdllmain.o)
-endif
-
-LIBPASSTHRU=	$(addprefix $(LIBDIR)/, $(PASSTHRU_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
-endif
-
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libpassthru.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBPASSTHRU)
-
-$(LIBPASSTHRU): $(OBJS) $(LIBPASSTHRU_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBPASSTHRU_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBPASSTHRU_DLL_OBJ)
-endif
-	$(RM) $(LIBPASSTHRU)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(OBJS):	passthru.h
diff --git a/ldap/servers/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
deleted file mode 100644
index 477e285f..00000000
--- a/ldap/servers/plugins/presence/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libpresence
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./presence.def
-endif
-
-PRESENCE_OBJS =	presence.o
-OBJS = $(addprefix $(OBJDEST)/, $(PRESENCE_OBJS)) 
-
-PRESENCE_DLL = libpresence-plugin
-
-INCLUDES += -I../http -I../../slapd  -I../../../include  
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-PRESENCE_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK)  $(NSPRLINK)  $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS_DEP +=   $(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-EXTRA_LIBS += $(LDAP_COMMON_LIBS)
-endif
-
-PRESENCE=	$(addprefix $(LIBDIR)/, $(PRESENCE_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(PRESENCE)
-
-ifeq ($(ARCH), WINNT)
-$(PRESENCE): $(OBJS) $(PRESENCE_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(PRESENCE_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(PRESENCE): $(OBJS) $(PRESENCE_DLL_OBJ) 
-	$(LINK_DLL) $(PRESENCE_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(PRESENCE_DLL_OBJ)
-endif
-	$(RM) $(PRESENCE)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(LIBDIR):
-	$(MKDIR) $(LIBDIR)
diff --git a/ldap/servers/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
deleted file mode 100644
index 4ff2aff7..00000000
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server password_storaged-plugin.so password storage scheme plugins
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libpwdstorage
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libpwdstorage.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-PWD_OBJS= \
-	pwd_init.o \
-	clear_pwd.o \
-	ns-mta-md5_pwd.o \
-	sha_pwd.o \
-	ssha_pwd.o \
-	md5c.o \
-	md5_pwd.o
-
-ifneq ($(ARCH), WINNT)
-PWD_OBJS += crypt_pwd.o
-endif
-
-
-OBJS = $(addprefix $(OBJDEST)/, $(PWD_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBPWD_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LIBPWD =	$(addprefix $(LIBDIR)/, $(PWD_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += \
-	$(LIBSLAPD_DEP) \
-	$(LDAP_LIBUTIL_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += \
-	$(LDAPSDK_DEP) \
-	$(SECURITY_DEP)
-EXTRA_LIBS += \
-	$(LIBSLAPD) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LIBUTIL) \
-	$(NSPRLINK) \
-	$(LDAP_COMMON_LIBS) \
-	$(SECURITYLINK)
-endif
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += \
-	$(LIBSLAPD_DEP) \
-	$(LDAP_LIBUTIL_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += \
-	$(LDAPSDK_DEP) \
-	$(SECURITY_DEP)
-EXTRA_LIBS += \
-	$(LIBSLAPDLINK) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LIBUTIL) \
-	$(NSPRLINK) \
-	$(LDAP_COMMON_LIBS) \
-	$(SECURITYLINK)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libpwdstorage.def"
-CFLAGS+= /WX 
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-LD=ld
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBPWD)
-
-$(LIBPWD): $(OBJS) $(LIBPWD_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBPWD_DLL_OBJ) $(EXTRA_LIBS) 
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBPWD_DLL_OBJ)
-endif
-	$(RM) $(LIBPWD)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
deleted file mode 100644
index b6de7d15..00000000
--- a/ldap/servers/plugins/referint/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/referint-plugin
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./referint.def
-endif
-
-REFERINT_OBJS =	referint.o 
-OBJS = $(addprefix $(OBJDEST)/, $(REFERINT_OBJS)) 
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPLINK_DEP) $(NSPRLINK_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAPLINK) $(NSPRLINK)
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(SECURITY_DEP)
-EXTRA_LIBS += $(SECURITYLINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-REFERINT_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-LD=ld
-endif
-
-REFERINT=	$(addprefix $(LIBDIR)/, $(REFERINT_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(REFERINT)
-
-ifeq ($(ARCH), WINNT)
-$(REFERINT): $(OBJS) $(REFERINT_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(REFERINT_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(REFERINT): $(OBJS) $(REFERINT_DLL_OBJ) 
-	$(LINK_DLL) $(REFERINT_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(REFERINT_DLL_OBJ)
-endif
-	$(RM) $(REFERINT)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
deleted file mode 100644
index a348bed8..00000000
--- a/ldap/servers/plugins/replication/Makefile
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "Replication" plugin
-#
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/replication-plugin
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./replication.def
-endif
-
-CFLAGS += $(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-CFLAGS += /WX
-endif
-
-ifdef TEST_CL5
-CFLAGS += -DTEST_CL5
-endif
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd -I$(DB_INCLUDE)
-
-LOCAL_OBJS= \
-	cl5_api.o \
-	cl5_clcache.o \
-	cl5_config.o \
-	cl5_init.o \
-	csnpl.o\
-	legacy_consumer.o \
-	llist.o\
-	repl5_agmt.o \
-	repl5_agmtlist.o \
-	repl5_backoff.o \
-	repl5_connection.o \
-	repl5_inc_protocol.o \
-	repl5_init.o\
-	repl5_protocol.o \
-	repl5_protocol_util.o \
-	repl5_replica.o\
-	repl5_replica_config.o\
-	repl5_ruv.o\
-	repl5_schedule.o \
-	repl5_tot_protocol.o \
-	repl5_total.o\
-	repl5_mtnode_ext.o\
-	repl5_plugins.o \
-	repl_add.o \
-	repl_bind.o \
-	repl_compare.o \
-	repl_connext.o \
-	repl_controls.o \
-	repl_delete.o \
-	repl_entry.o \
-	repl_ext.o \
-	repl_extop.o \
-	repl_globals.o \
-	repl_init.o \
-	repl_modify.o \
-	repl_modrdn.o \
-	repl_monitor.o \
-	repl_objset.o \
-	repl_opext.o \
-	repl_ops.o \
-	repl_rootdse.o \
-	repl_search.o \
-	replutil.o \
-	urp.o \
-	urp_glue.o \
-	urp_tombstone.o \
-	repl5_replica_hash.o\
-	repl5_replica_dnhash.o\
-	repl5_updatedn_list.o\
-	windows_inc_protocol.o \
-	windows_tot_protocol.o \
-	windows_protocol_util.o \
-	windows_private.o \
-	windows_connection.o
-
-LIBREPLICATION_OBJS = $(addprefix $(OBJDEST)/, $(LOCAL_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-REPLICATION_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LIBREPLICATION=	$(addprefix $(LIBDIR)/, $(REPLICATION_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(DB_LIB_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAPLINK) $(DB_LIB)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(DB_LIB_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(DB_LIB)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./replication.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-# ICU used by Windows Sync code
-INCLUDES+= $(ICU_INCLUDE)
-EXTRA_LIBS+=$(ICULINK) 
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBREPLICATION)
-
-$(LIBREPLICATION): $(LIBREPLICATION_OBJS) $(REPLICATION_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBREPLICATION_OBJS) $(REPLICATION_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS) $(LDAP_LIBLDIF) $(NSPRLINK)
-
-tests:	$(TEST_PROGS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(LIBREPLICATION_OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(REPLICATION_DLL_OBJ)
-endif
-	$(RM) $(LIBREPLICATION)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(LIBREPLICATION_OBJS):	
diff --git a/ldap/servers/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
deleted file mode 100644
index 3dd33d49..00000000
--- a/ldap/servers/plugins/retrocl/Makefile
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "Retrocl" plugin
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/retrocl-plugin
-BINDIR = $(LDAP_SERVER_RELDIR)
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-INCLUDES+=-I$(DB_INCLUDE)
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./retrocl.def
-endif
-
-CFLAGS += $(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-CFLAGS += /WX
-endif
-
-ifdef TEST_CL5
-CFLAGS += -DTEST_CL5
-endif
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd -I$(DB_INCLUDE)
-
-ifeq ($(ARCH), WINNT)
-SUBSYSTEM=console
-endif
-
-LOCAL_OBJS= \
-	retrocl.o \
-	retrocl_po.o \
-	retrocl_rootdse.o \
-	retrocl_cn.o \
-	retrocl_trim.o \
-	retrocl_create.o \
-
-
-
-LIBRETROCL_OBJS = $(addprefix $(OBJDEST)/, $(LOCAL_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-RETROCL_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LIBRETROCL=	$(addprefix $(LIBDIR)/, $(RETROCL_DLL).$(DLL_SUFFIX))
-
-LT_OBJS = $(addprefix $(OBJDEST)/, linktest.o) 
-
-#EXTRA_LIBS_DEP = $(LDAPSDK_DEP) \
-#	$(LDAP_LIBLDIF_DEP) \
-#	$(LDAP_SLIBLCACHE_DEP) $(DB_LIB_DEP) $(LIBSLAPD_DEP) \
-#	$(LDAP_COMMON_LIBS_DEP)
-
-#EXTRA_LIBS = $(LIBACCESS) $(LDAP_SDK_LIBSSLDAP_LIB) $(ADMINUTIL_LINK) \
-#	$(LDAP_SDK_LIBLDAP_DLL) $(LDAP_SLIBLCACHE) $(DB_LIB) \
-#	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) $(LIBSLAPD)  $(LDAP_LIBLITEKEY) \
-#	$(NLSLINK) $(ALIBS) \
-#	$(LDAP_SDK_LIBSSLDAP_LIB) $(LDAP_SDK_LIBLDAP_DLL) \
-#	$(LIBSECURITYLINK) $(NSPRLINK) $(DBMLINK) \
-#	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK)
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(DB_LIB_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(DB_LIB)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP) $(DB_LIB_DEP) $(NSPR_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) $(DB_LIB)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./retrocl.def"
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBRETROCL) 
-
-linktest: $(LIBRETROCL) $(LT_OBJS)
-	$(LINK_EXE_NOLIBSOBJS) -o linktest $(LT_OBJS) $(LIBRETROCL) -Rlib -Rlib/../bin/slapd/lib -Llib -Llib/../bin/slapd/lib  -lslapd $(EXTRA_LIBS) $(NSPRLINK)
-
-
-$(LIBRETROCL): $(LIBRETROCL_OBJS) $(RETROCL_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBRETROCL_OBJS) $(RETROCL_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS) $(LDAP_LIBLDIF) $(NSPRLINK)
-
-tests:	$(TEST_PROGS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(LIBRETROCL_OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(RETROCL_DLL_OBJ)
-endif
-	$(RM) $(LIBRETROCL)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(LIBRETROCL_OBJS):	
diff --git a/ldap/servers/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
deleted file mode 100644
index a271a522..00000000
--- a/ldap/servers/plugins/rever/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server password_storaged-plugin.so password storage scheme plugins
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libdes
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(BUILD_ROOT)/ns_usepurify.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libdes.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-INCLUDES += -I$(BUILD_ROOT)/ldap/include
-
-REVER_OBJS= \
-	rever.o des.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(REVER_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBREVER_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-REVER_DLL = libdes-plugin
-LIBREVER =	$(addprefix $(LIBDIR)/, $(REVER_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += \
-	$(LIBSLAPD_DEP) \
-	$(LDAP_LIBUTIL_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += \
-	$(LDAPSDK_DEP) \
-	$(SECURITY_DEP)
-EXTRA_LIBS += \
-	$(LIBSLAPD) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LIBUTIL) \
-	$(NSPRLINK) \
-	$(LDAP_COMMON_LIBS) \
-	$(SECURITYLINK)
-endif
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += \
-	$(LIBSLAPD_DEP) \
-	$(LDAP_LIBUTIL_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
-EXTRA_LIBS_DEP += \
-	$(LDAPSDK_DEP) \
-	$(SECURITY_DEP)
-EXTRA_LIBS += \
-	$(LIBSLAPDLINK) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LIBUTIL) \
-	$(NSPRLINK) \
-	$(LDAP_COMMON_LIBS) \
-	$(SECURITYLINK)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libdes.def"
-CFLAGS+= /WX 
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-LD=ld
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBREVER)
-
-$(LIBREVER): $(OBJS) $(LIBREVER_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBREVER_DLL_OBJ) $(EXTRA_LIBS) 
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBREVER_DLL_OBJ)
-endif
-	$(RM) $(LIBREVER)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
deleted file mode 100644
index 47cc2d39..00000000
--- a/ldap/servers/plugins/roles/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libroles
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-ifndef INSTDIR
-INSTDIR = c:/netscape/server4/
-endif
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./roles.def
-endif
-
-ROLES_OBJS = roles_plugin.o roles_cache.o
-OBJS = $(addprefix $(OBJDEST)/, $(ROLES_OBJS)) 
-
-ROLES_DLL = libroles-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-# DBDB this is clearly all nonsense: the libraries this thing links with should not depend on the platform.
-# However, for now I make this AIX-specific change and leave the NT-specifc stuff in place (I think it came
-# from the makefile I copied to make this one. After build 3, fix this.
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_LIBAVL)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), WINNT)
-ROLES_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-LD=ld
-EXTRA_LIBS += $(NSPRLINK) $(LIBSLAPD) $(LDAP_LIBAVL)
-endif
-
-ROLES=	$(addprefix $(LIBDIR)/, $(ROLES_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(ROLES)
-
-ifeq ($(ARCH), WINNT)
-$(ROLES): $(OBJS) $(ROLES_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(ROLES_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(ROLES): $(OBJS) $(ROLES_DLL_OBJ) 
-	$(LINK_DLL) $(ROLES_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(ROLES_DLL_OBJ)
-endif
-	$(RM) $(ROLES)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-# Target to push the built binary to an installed server
-#ROLES_PUSH = $(addprefix $(INSTDIR)lib/, $(notdir $(ROLES)))
-#push: $(ROLES_PUSH)
-
-#$(ROLES_PUSH): $(ROLES)
-#	cp $(ROLES) $(ROLES_PUSH)
diff --git a/ldap/servers/plugins/shared/Makefile b/ldap/servers/plugins/shared/Makefile
deleted file mode 100644
index 17c28cba..00000000
--- a/ldap/servers/plugins/shared/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for shared components for Directory Server plugins
-#
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-SHARED=shared
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/$(SHARED)
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-LOCAL_OBJS=  utils.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(LOCAL_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS += $(LIBSLAPD)
-endif
-
-all:	$(OBJDEST) $(OBJS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(OBJS): plugin-utils.h
-
diff --git a/ldap/servers/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
deleted file mode 100644
index 4ef63a95..00000000
--- a/ldap/servers/plugins/statechange/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libstatechange
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./statechange.def
-endif
-
-STATECHANGE_OBJS =	statechange.o
-OBJS = $(addprefix $(OBJDEST)/, $(STATECHANGE_OBJS)) 
-
-STATECHANGE_DLL = libstatechange-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) 
-STATECHANGE_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), AIX)
-LD=ld
-EXTRA_LIBS += $(LIBSLAPD) 
-endif
-
-STATECHANGE=	$(addprefix $(LIBDIR)/, $(STATECHANGE_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(STATECHANGE)
-
-ifeq ($(ARCH), WINNT)
-$(STATECHANGE): $(OBJS) $(STATECHANGE_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(STATECHANGE_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(STATECHANGE): $(OBJS) $(STATECHANGE_DLL_OBJ) 
-	$(LINK_DLL) $(STATECHANGE_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(STATECHANGE_DLL_OBJ)
-endif
-	$(RM) $(STATECHANGE)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
deleted file mode 100644
index 507d8f35..00000000
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server syntax-plugin.so syntax plugins
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libsyntax
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libsyntax.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-SYNTAX_OBJS=	phonetic.o string.o cis.o sicis.o ces.o bin.o tel.o dn.o int.o \
-		value.o debug.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(SYNTAX_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-LIBSYNTAX_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LIBSYNTAX=	$(addprefix $(LIBDIR)/, $(SYNTAX_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAP_LIBUTIL_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-endif
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAP_LIBUTIL_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libsyntax.def"
-CFLAGS+= /WX 
-endif # WINNT
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS) 
-LD=ld
-endif
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBSYNTAX)
-
-$(LIBSYNTAX): $(OBJS) $(LIBSYNTAX_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(LIBSYNTAX_DLL_OBJ) $(EXTRA_LIBS) 
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBSYNTAX_DLL_OBJ)
-endif
-	$(RM) $(LIBSYNTAX)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
diff --git a/ldap/servers/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
deleted file mode 100644
index a64a40d9..00000000
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# GNU Makefile for Directory Server "Pass Through Authentication" plugin
-#
-#
-
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libuidunique
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-SHAREDLIB = $(OBJDIR)/lib/shared/utils.o
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./libuiduniq.def
-endif
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd -I../shared
-
-LOCAL_OBJS=  uid.o 7bit.o
-
-SHAREDDIR= ../shared
-
-OBJS = $(addprefix $(OBJDEST)/, $(LOCAL_OBJS)) 
-
-ifeq ($(ARCH), WINNT)
-#LIBUIDUNIQUE_DLL_OBJ = $(addprefix $(OBJDEST)/, uid.o 7bit.o)
-endif
-
-LIBUIDUNIQUE=	$(addprefix $(LIBDIR)/, $(UID_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-endif
-
-
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libuiduniq.def"
-EXTRA_LIBS += $(NSPRLINK)
-endif # WINNT
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS)
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-EXTRA_LIBS += $(SHAREDLIB)
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBUIDUNIQUE)
-
-$(LIBUIDUNIQUE): $(OBJS) $(LIBUIDUNIQUE_DLL_OBJ) $(DEF_FILE)
-#	$(LINK_DLL) $(LIBUIDUNIQUE_DLL_OBJ) $(PLATFORMLIBS) $(EXTRA_LIBS)
-	$(LINK_DLL) $(PLATFORMLIBS) $(EXTRA_LIBS)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBUIDUNIQUE_DLL_OBJ)
-endif
-	$(RM) $(LIBUIDUNIQUE)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-#
-# header file dependencies (incomplete)
-#
-$(OBJS): $(LDAP_SRC)/servers/slapd/slapi-plugin.h \
-          ../shared/plugin-utils.h 
-
diff --git a/ldap/servers/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
deleted file mode 100644
index 9ed7c0c7..00000000
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libvattrsp
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./vattrsp.def
-endif
-
-VATTRSP_OBJS =	vattrsp.o
-OBJS = $(addprefix $(OBJDEST)/, $(VATTRSP_OBJS)) 
-
-VATTRSP_DLL = libvattrsp-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-VATTRSP_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK)  $(NSPRLINK)  $(LDAP_SDK_LIBLDAP_DLL)
-LD=ld
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-VATTRSP=	$(addprefix $(LIBDIR)/, $(VATTRSP_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(VATTRSP)
-
-ifeq ($(ARCH), WINNT)
-$(VATTRSP): $(OBJS) $(VATTRSP_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(VATTRSP_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(VATTRSP): $(OBJS) $(VATTRSP_DLL_OBJ) 
-	$(LINK_DLL) $(VATTRSP_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(VATTRSP_DLL_OBJ)
-endif
-	$(RM) $(VATTRSP)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(LIBDIR):
-	$(MKDIR) $(LIBDIR)
diff --git a/ldap/servers/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
deleted file mode 100644
index 521b6f14..00000000
--- a/ldap/servers/plugins/views/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-LDAP_SRC = ../../..
-BUILD_ROOT = ../../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/lib/libviews
-LIBDIR = $(LDAP_PLUGIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-DEF_FILE:=./views.def
-endif
-
-VIEWS_OBJS =	views.o
-OBJS = $(addprefix $(OBJDEST)/, $(VIEWS_OBJS)) 
-
-VIEWS_DLL = libviews-plugin
-
-INCLUDES += -I../../slapd  -I../../../include
-CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(NSPRLINK)  $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL)
-VIEWS_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP)
-EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK)
-endif
-
-ifeq ($(ARCH), AIX)
-LD=ld
-EXTRA_LIBS_DEP +=   $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP)
-EXTRA_LIBS += $(LIBSLAPDLINK)  $(NSPRLINK)  $(LDAP_SDK_LIBLDAP_DLL)
-endif
-
-VIEWS=	$(addprefix $(LIBDIR)/, $(VIEWS_DLL).$(DLL_SUFFIX))
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LIBDIR) $(VIEWS)
-
-ifeq ($(ARCH), WINNT)
-$(VIEWS): $(OBJS) $(VIEWS_DLL_OBJ) $(DEF_FILE)
-	$(LINK_DLL) $(VIEWS_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE)
-else
-$(VIEWS): $(OBJS) $(VIEWS_DLL_OBJ) 
-	$(LINK_DLL) $(VIEWS_DLL_OBJ) $(EXTRA_LIBS)
-endif
-
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(VIEWS_DLL_OBJ)
-endif
-	$(RM) $(VIEWS)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)