Resolves: #237040

Summary: Remove obsolete makefiles

78 files changed, 0 insertions, 15259 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index ec9118fa..00000000
--- a/Makefile
+++ /dev/null
@@ -1,367 +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
-# 
-# Top-level gmake Makefile for LDAP Server builds.
-#
-# Execute the command:
-#
-#       gmake help
-#
-# to see a list of available targets.
-
-# Relative path to the top of the build tree (i.e., where the DS source tree is checked out)
-BUILD_ROOT=.
-
-# define COMPONENT_DEPS here so that components are pulled in this makefile
-COMPONENT_DEPS := 1
-
-include nsdefs.mk
-include nsconfig.mk
-
-# first (default) rule: build and create a DS package
-all:	buildAndPkgDirectory
-
-help:
-	@echo
-	@echo The following are build targets that you can choose from:
-	@echo
-	@echo "   gmake buildAndPkgDirectory"
-	@echo "   gmake buildDirectory"
-	@echo "   gmake pkgDirectory"
-	@echo "   gmake pkgDirectoryl10n"
-	@echo "   gmake pkgDirectoryPseudoL10n"
-	@echo "   gmake with no arguments will do buildAndPkgDirectory, which "
-	@echo "         is usually what you want to do"
-	@echo ""
-	@echo "   The following are optional build flags which build or pull in"
-	@echo "   optional components which are only available internally for"
-	@echo "   now.  In the future these components may be made available"
-	@echo "   externally or in an open source version."
-	@echo "   USE_ADMINSERVER=1 - bundle the Admin Server (required to run Console/webapps)"
-	@echo "   USE_CONSOLE=1     - bundle the Administration Console (requires Java)"
-	@echo "   USE_DSMLGW=1      - build/bundle the DSMLv2 Gateway (requires Java)"
-	@echo "   USE_ORGCHART=1    - build/bundle the Org Chart webapp"
-	@echo "   USE_DSGW=1        - build/bundle the Phonebook/DS Gateway webapp"
-	@echo "   USE_JAVATOOLS=1   - build/bundle the Java command line tools"
-	@echo "   USE_SETUPUTIL=1    - build/bundle programs that use Setuputil"
-
-###### Implementation notes:
-#
-# We use ../reltools/ftp_puller_new.pl to pull and maintain dependencies
-# for the components (binary and header files) we use for the build.  The
-# dependencies are maintained in the file ../components.OS, where OS is
-# the operating system.  These files do not exist in CVS; they are created
-# as needed.  We could probably make the system smarter to know the
-# difference between debug/optimized and export/domestic, but for now it
-# does not. 
-#
-# The file ./component_versions.mk contains the component version
-# information.  If you want to change the version of a component used
-# to build or package, this is the place to look.
-#
-#
-# The file ./components.mk contains the information about what files and
-# directories are used by the component.  It also contains the
-# information about how to pull the component.  Each component defines a
-# XXX_DEP macro which is the name of a file to be used for dependency
-# checking.
-#
-#
-# By default, NT uses FTP and Unix uses SYMLINK as their pull methods.
-# This is controlled by the COMPONENT_PULL_METHOD macro.  For example,
-# on Unix, you can use
-#
-#     gmake COMPONENT_PULL_METHOD=FTP buildDirectory 
-#
-# To force use of ftp to pull all components.  In addition, each component
-# can have a XXX_PULL_METHOD macro.  If this macro is defined, it overrides
-# the default.  For example, on Unix, you can use
-#
-#     gmake NSPR_PULL_METHOD=FTP buildDirectory
-#
-# if you want to get NSPR via ftp and the other components via symlink.
-#
-#
-# By default, the components are only pulled from the top level if you do
-# a gmake buildDirectory.  There is a macro called COMPONENT_DEPS.  If
-# this is defined on the command line of the gmake command e.g.
-#
-#     gmake COMPONENT_DEPS=1 ... 
-#
-# this will force component checking and pulling.  This will have the
-# effect of slowing down the build.
-#
-###### End of implementation notes.
-
-ifeq ($(INTERNAL_BUILD), 1)
-# first list core dependencies
-  COMPONENT_DEPENDENCIES = $(NSPR_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) $(LDAPSDK_DEP) \
-	$(ICU_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP)
-# these are only for packaging
-  COMPONENT_DEPENDENCIES += $(ADSYNC_DEP) $(NT4SYNC_DEP)
-ifeq ($(USE_PERLDAP), 1)
-  COMPONENT_DEPENDENCIES += $(PERLDAP_DEP)
-endif
-ifeq ($(USE_ADMINSERVER), 1)
-  COMPONENT_DEPENDENCIES += $(ADMINUTIL_DEP) $(DSDOC_DEP)
-endif
-ifeq ($(USE_SETUPUTIL), 1)
-  COMPONENT_DEPENDENCIES += $(SETUPUTIL_DEP)
-endif
-ifeq ($(USE_DSMLGW), 1)
-  COMPONENT_DEPENDENCIES += $(AXIS_DEP) $(DSMLJAR_DEP)
-endif
-endif
-
-components: $(COMPONENT_DEPENDENCIES)
-	-@echo "The components are up to date"
-
-ifeq ($(BUILD_JAVA_CODE),1)
-DS_CONSOLE_COMPONENT_DEP  = $(LDAPJDK_DEP) $(LDAPCONSOLE_DEP)
-DS_CONSOLE_COMPONENT_DEP += $(JAVASSL_DEP) $(JSS_DEP) $(CRIMSONJAR_DEP)
-java_platform_check:
-
-else
-
-DS_CONSOLE_COMPONENT_DEP  =
-java_platform_check:
-	-@echo "Note: Java code is not built on this platform ($(ARCH))."
-	-@echo "      Use 'gmake BUILD_JAVA_CODE=1 ...' to override."
-endif
-
-consoleComponents: $(DS_CONSOLE_COMPONENT_DEP)
-
-buildnum:
-	if test ! -d $(BUILD_ARCH); then mkdir $(BUILD_ARCH); fi;
-	$(PERL) buildnum.pl -p $(BUILD_ARCH)
-
-nsCommon:
-	cd config;		$(MAKE) export $(NSDEFS)
-# XXXsspitzer:  for UNIXWARE and UnixWare
-ifeq ($(subst nix,NIX,$(subst are,ARE,$(ARCH))), UNIXWARE)
-	- mkdir built/$(NS_BUILD_FLAVOR)/obj
-	cd built/$(NS_BUILD_FLAVOR)/obj && ar xv ../../../$(LIBNSPR) uxwrap.o
-endif
-ifeq ($(ARCH), WINNT)
-	cd lib/libnt;	$(MAKE) $(MFLAGS) export $(NSDEFS)
-	cd lib/libnt;	$(MAKE) $(MFLAGS) libs $(NSDEFS)
-endif
-
-#
-# Notice that BUILD_MODULE is not supplied directly on this target.
-# It either inherits from the calling target or from the default in
-# nsdefs.mk.  Therefore if you need to perform 'gmake httpdlib', be sure
-# that BUILD_MODULE is set to whatever target release that you need.
-#
-httpdLib:
-	@echo 
-	@echo 
-	@echo 
-	@echo ==== Starting Server LIBS for: $(BUILD_MODULE) ==========
-	@echo
-	cd lib/base; 		$(MAKE) $(MFLAGS)
-	cd lib/ldaputil;	$(MAKE) $(MFLAGS)
-	cd lib/libaccess; 	$(MAKE) $(MFLAGS)
-	cd lib/libadmin; 	$(MAKE) $(MFLAGS)
-	cd lib/libsi18n; 	$(MAKE) $(MFLAGS)
-	@echo ==== Finished Server LIBS for: $(BUILD_MODULE) ==========
-	@echo 
-
-brandDirectory: $(RELTOOLSPATH)/brandver.pl
-	@echo ==== Branding LDAP Server ==========
-	$(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
-	@echo ==== Finished Branding LDAP Server ==========
-
-versionDirectory: $(RELTOOLSPATH)/brandver.pl
-	@echo ==== Debranding LDAP Server ==========
-	$(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
-	@echo ==== Finished Debranding LDAP Server ==========
-
-normalizeDirectory: $(RELTOOLSPATH)/brandver.pl
-	@echo ==== Normalizing LDAP Server ==========
-	$(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
-	@echo ==== Normalizing Branding LDAP Server ==========
-
-buildAndPkgDirectory:	buildDirectory pkgDirectory
-
-buildDirectory: buildnum $(PUMPKIN_TARGET) $(OBJDIR) $(DIRVER_H) $(SDKVER_H) components 
-	@echo 
-	@echo 
-	@echo ==== Starting LDAP Server ==========
-	@echo
-	$(MAKE) $(MFLAGS) nsCommon
-	cd config;           $(MAKE) $(MFLAGS) install $(NSDEFS)
-	$(MAKE) $(MFLAGS) BUILD_MODULE=DIRECTORY LDAP_NO_LIBLCACHE=1 httpdLib
-ifeq ($(ARCH), WINNT)
-	$(PERL) ntversion.pl $(BUILD_ROOT) $(MAJOR_VERSION) $(MINOR_VERSION)
-endif
-	cd httpd/src; $(MAKE) $(MFLAGS) LDAP_NO_LIBLCACHE=1 BUILD_MODULE=DIRECTORY all
-	cd ldap; $(MAKE) $(MFLAGS) LDAP_NO_LIBLCACHE=1 BUILD_MODULE=DIRECTORY all
-	@echo ==== Finished LDAP Server ==========
-	@echo
-	@echo ==== Starting LDAP Server Clients ==========
-	@echo
-	$(MAKE) $(MFLAGS) buildDirectoryClients
-	@echo
-	@echo ==== Finished LDAP Server Clients ==========
-	@echo
-	@echo ==== Starting LDAP Server Console ==========
-	@echo
-	$(MAKE) $(MFLAGS) buildDirectoryConsole
-	@echo
-	@echo ==== Finished LDAP Server Console ==========
-	@echo
-
-cleanDirectory:
-	@echo
-	@echo
-	@echo ==== Cleaning LDAP Server on $(ARCH) ====
-	@echo
-	rm -rf $(ARCH)
-	rm -rf built/$(NS_BUILD_FLAVOR)
-	rm -rf built/release/slapd/$(NS_BUILD_FLAVOR)
-	rm -rf ../dist/$(NSOBJDIR_NAME)
-	rm -rf ../dist/full
-	rm -rf $(CLASS_DEST)	# ../dist/classes
-	@echo
-	@echo ==== All done ===
-	@echo
-
-buildDirectoryConsole: consoleComponents java_platform_check
-ifeq ($(BUILD_JAVA_CODE),1)
-#	cd ldap/admin/src/java/com/netscape/admin/dirserv; $(MAKE) $(MFLAGS) package
-    ifeq ($(USE_JAVATOOLS), 1)
-		cd ldap/admin/src/java/com/netscape/xmltools; $(MAKE) $(MFLAGS) package
-    endif
-endif
-
-buildDirectoryClients: $(ANT_DEP) java_platform_check
-ifeq ($(USE_DSGW), 1)
-	cd ldap/clients; $(MAKE) _dsgw
-endif
-ifeq ($(BUILD_JAVA_CODE),1)
-    ifeq ($(USE_DSMLGW), 1)
-		cd ldap/clients; $(MAKE) _dsmlgw
-    endif
-endif
-
-$(OBJDIR):
-	if test ! -d $(OBJDIR); then mkdir -p $(OBJDIR); fi;
-
-$(RELTOOLSPATH)/brandver.pl:
-	cd $(ABS_ROOT)/.. ; cvs co RelToolsLite
-
-$(SDKVER_H):
-	if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi;
-	$(PERL) dirver.pl -v "$(DIRSDK_VERSION)" -o $@
-
-$(DIRVER_H):
-	if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi;
-	$(PERL) dirver.pl -v "$(DIR_VERSION)" -o $@
-
-pkgLdapSDK: setupLdapSDK
-	@echo
-	@echo =========== Finished - LDAP SDK  Package Build ============
-
-setupLdapSDK:
-	@echo =========== Starting - LDAP SDK  Package Build ============
-	@echo	
-	cd ldap/cm; $(MAKE) $(MAKEFLAGS) releaseLdapSDK 
-	cd ldap/cm; $(MAKE) $(MAKEFLAGS) packageLdapSDK 
-
-
-pkgDirectory:	setupDirectory
-	@echo
-	@echo =========== Finished - LDAP Server Package Build ============
-
-Acceptance:
-	cd ldap/cm; $(MAKE) Acceptance $(MFLAGS)
-
-Longduration:
-	cd ldap/cm; $(MAKE) Longduration $(MFLAGS)
-
-releaseDirectory:
-	cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory
-
-setupDirectory:
-	cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory;
-	cd ldap/cm; $(MAKE) $(MFLAGS) packageDirectory;
-
-pkgDirectoryJars:
-	cd ldap/cm; $(MAKE) $(MFLAGS) packageJars 
-
-pkgDirectoryl10n:
-	@echo =========== Starting - LDAP Server International Package Build ============
-	cd ldap/cm; $(MAKE) $(MFLAGS) l10nRePackage
-	@echo =========== Finished - LDAP Server International Package Build ============
-
-pkgDirectoryPseudoL10n:
-	@echo =========== Starting - LDAP Server L10N Package Build ============
-ifeq ($(BUILD_SECURITY),export)
-ifeq ($(BUILD_DEBUG),optimize)
-	cd i18npkg/apollo; $(MAKE) $(MFLAGS)
-else
-	@echo skipping pkgDirectoryPseudoL10n
-endif
-else
-	@echo skipping pkgDirectoryPseudoL10n
-endif
-	@echo =========== Finished - LDAP Server L10N Package Build ============
-
-redhat-ds.spec: ldapserver.spec.tmpl branding/rhds/brandver.dat $(RELTOOLSPATH)/brandver.pl
-	sed -e s/@PLATFORM@/$(BUILD_ARCH)/g ldapserver.spec.tmpl > $@
-	$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat $@
-	mv $@ $(OBJDIR)
-
-ifdef INTERNAL_BUILD
-fedora-ds.spec: ldapserver.spec.tmpl branding/fedora/brandver.dat $(RELTOOLSPATH)/brandver.pl
-	sed -e s/@PLATFORM@/$(BUILD_ARCH)/g ldapserver.spec.tmpl > $@
-	$(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat $@
-	mv $@ $(OBJDIR)
-else
-fedora-ds.spec: ldapserver.spec.tmpl
-	sed -e s/@PLATFORM@/$(BUILD_ARCH)/g \
-	-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
-	-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
-	-e 's/@GEN-VERSION@/1.0/g' \
-	-e 's/@NOSP-VERSION@/1.0.4/g' \
-	-e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
-	ldapserver.spec.tmpl > $@
-	mv $@ $(OBJDIR)
-endif # INTERNAL_BUILD
diff --git a/buildpaths.mk b/buildpaths.mk
deleted file mode 100644
index 316730bb..00000000
--- a/buildpaths.mk
+++ /dev/null
@@ -1,166 +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
-#
-# This file is where you tell the build process where to find the
-# various components used during the build process.
-
-# You can either use components built locally from source or
-# pre-built components.  The reason for the different macros
-# for SOURCE and BUILD is that the locations for the libs, includes,
-# etc. are usually different for packages built from source vs.
-# pre-built packages.  As an example, when building NSPR from
-# source, the includes are in mozilla/dist/$(OBJDIR_NAME)/include
-# where OBJDIR_NAME includes the OS, arch, compiler, thread model, etc.
-# When using the pre-built NSPR from Mozilla FTP, the include files
-# are just in nsprdir/include.  This is why we have to make the
-# distinction between a SOURCE component and a BUILD (pre-built)
-# component.  See components.mk for the gory details.
-
-# For each component, specify the source root OR the pre-built
-# component directory.  If both a SOURCE_ROOT and a BUILD_DIR are
-# defined for a component, the SOURCE_ROOT will be used - don't do
-# this, it's confusing.
-
-# For the Mozilla components, if using source for all of them,
-# you can just define MOZILLA_SOURCE_ROOT - the build will
-# assume all of them have been built in that same directory
-# (as per the recommended build instructions)
-
-# For all components, the recommended way is to put each
-# component in a subdirectory of the parent directory of
-# BUILD_ROOT, both with pre-built and source components
-
-MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
-ifdef MOZILLA_SOURCE_ROOT
-  ifndef MOZ_OBJDIR_NAME
-    # some of the mozilla components are put in a platform/buildtype specific
-    # subdir of mozilla/dist, and their naming convention is different than
-    # ours - we need to map ours to theirs
-    ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
-      MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
-      MOZ_OBJDIR_NAME_32 = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
-    else
-    ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
-      MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
-      MOZ_OBJDIR_NAME_32 = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
-    else
-    ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
-      MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
-      MOZ_OBJDIR_NAME_32 = $(subst _glibc_PTH_,_glibc_PTH_,$(NSOBJDIR_NAME))
-    else
-      MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
-      MOZ_OBJDIR_NAME_32 = $(NSOBJDIR_NAME_32)
-    endif
-    endif
-    endif
-  endif
-endif
-
-NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#NSPR_BUILD_DIR = $(BUILD_ROOT)/../nspr-4.4.1
-# NSPR also needs a build dir with a full, absolute path for some reason
-#NSPR_ABS_BUILD_DIR = $(shell cd $(NSPR_BUILD_DIR) && pwd)
-
-DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#DBM_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
-
-SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#SECURITY_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
-
-SVRCORE_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#SVRCORE_BUILD_DIR = $(BUILD_ROOT)/../svrcore-4.0
-
-LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.15
-
-SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
-#SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl
-
-ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-#ICU_BUILD_DIR = $(BUILD_ROOT)/../icu-2.4
-
-DB_SOURCE_ROOT = $(BUILD_ROOT)/../db-4.2.52.NC
-# DB_MAJOR_MINOR is the root name for the db shared library
-# source builds use db-4.2 - lib is prepended later
-DB_MAJOR_MINOR := db-4.2
-# internal builds rename this to be db42
-#DB_MAJOR_MINOR := db42
-#component_name:=$(DB_MAJOR_MINOR)
-#db_path_config:=$(BUILD_ROOT)/../$(db_component_name)
-
-NETSNMP_SOURCE_ROOT = $(BUILD_ROOT)/../net-snmp-5.2.1
-#NETSNMP_BUILD_DIR = $(BUILD_ROOT)/../net-snmp
-
-ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
-#ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
-
-SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
-#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-
-# it's customary and easier to use the pre-built jar
-# you can get this from www.jpackage.org as well
-# we usually get this from the admin server package which
-# gets it from the console package
-#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
-# Crimson - crimson.jar - http://xml.apache.org/crimson/
-# you can get this from www.jpackage.org as well
-#CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson
-
-ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
-
-LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/..
-
-# these are the files needed to build the java components - xmltools and dsmlgw -
-# and where to get them
-# NOTE: www.jpackage.org has almost all of these, and you can configure yum or apt
-# or up2date or whatever your package manager is to pull them, which is nice because it will
-# also take care of the dependencies - http://www.jpackage.org/repos.php
-# Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar
-# Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
-# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
-# OR
-# JAF - activation.jar or jaf.jar - http://www.jpackage.org
-# NOTE - classpathx-jaf may also work
-# Codec - jakarta-commons-codec.jar - http://jakarta.apache.org/commons/codec/
-# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
-# all of these files need to be in the following directory:
-DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
-
-PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-
-ONLINEHELP_SOURCE_ROOT = $(BUILD_ROOT)/../dsonlinehelp
diff --git a/component_versions.mk b/component_versions.mk
deleted file mode 100644
index 0c0e8c14..00000000
--- a/component_versions.mk
+++ /dev/null
@@ -1,215 +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
-#
-# This file contains the version definitions for all components used in the build.  It
-# should be COMPLETELY AND TOTALLY SELF CONTAINED e.g. no references to macros defined
-# outside of this file.
-
-# The XXX_DIR OR XXX_VERSDIR or XXX_COMP or XXX_COMP_DIR macros are the name of the
-# base directory for the component under the main components directory
-# for example, the LDAP SDK component directory is
-# $(COMPONENTS_DIR)/$(LDAPCOMP_DIR) == /share/builds/components/ldapsdk31
-
-# the XXX_RELDATE or XXX_VERSION macros are the name of the subdirectory under
-# the component directory where the specific version can be found.  This is
-# usually in the form of YYYYMMDD, although NSPR et. al use a different
-# naming scheme.
-# NSPR
-ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.6.3-dstest
-endif
-
-# SECURITY (NSS) LIBRARY
-ifndef SECURITY_RELDATE
-  SECURITY_RELDATE = NSS_3_11_3_RTM
-endif
-
-# LIBDB
-DBDEFS:=
-ifndef DB_MAJOR_MINOR
-DB_MAJOR_MINOR:=db-4.2
-endif
-ifndef DB_VERSION
-  DB_VERSION:=20060308
-endif
-
-# SMARTHEAP
-ifndef SH_VERSION
-  SH_VERSION:=v6.01
-endif
-
-# LDAP SDK
-ifndef LDAP_RELDATE
-  LDAP_RELDATE = v6.0.0
-endif
-ifndef LDAPCOMP_DIR
-  LDAPCOMP_DIR=ldapcsdk
-endif
-
-# CRIMSONJAR 
-ifndef CRIMSONJAR_VERSION
-  CRIMSONJAR_VERSION = 1.1.3
-endif
-ifndef CRIMSONJAR_COMP
-  CRIMSONJAR_COMP = crimson
-endif
-
-# ANT 
-ifndef ANT_VERSION
-  ANT_VERSION = 1.6.2
-endif
-ifndef ANT_COMP
-  ANT_COMP = ant
-endif
-
-# LDAP JDK
-ifndef LDAPJDK_RELDATE
-  LDAPJDK_RELDATE = v4.17
-endif
-ifndef LDAPJDK_COMP
-  LDAPJDK_COMP = ldapjdk41
-endif
-
-# admin server
-
-ifndef ADM_RELDATE
-  ADM_RELDATE = 20060619
-endif
-ifndef ADM_VERSDIR
-  ADM_VERSDIR = adminserver/1.0
-endif
-
-# Net-SNMP
-ifndef NETSNMP_VER
-  NETSNMP_VER = v5.2.1
-endif
-
-# setuputil
-ifndef SETUPUTIL_RELDATE
-  SETUPUTIL_RELDATE = 20060615
-endif
-ifndef SETUPUTIL_VER
-  SETUPUTIL_VER = 10
-  SETUPUTIL_DOT_VER = 1.0
-endif
-
-ifndef SETUPUTIL_VERSDIR
-  SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER)
-endif
-
-# server core
-ifndef SVRCORE_RELDATE
-  SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
-endif
-
-# admin utility library
-ifndef ADMINUTIL_VER
-  ADMINUTIL_VER=10
-  ADMINUTIL_DOT_VER=1.0
-endif
-ifndef ADMINUTIL_RELDATE
-  ADMINUTIL_RELDATE=20060615
-endif
-
-ifndef ADMINUTIL_VERSDIR
-  ADMINUTIL_VERSDIR=adminutil/$(ADMINUTIL_DOT_VER)
-endif
-
-# LDAP Console
-ifndef LDAPCONSOLE_GENREL
-  LDAPCONSOLE_GENREL=1.0
-endif
-ifndef LDAPCONSOLE_REL
-  LDAPCONSOLE_REL=1.0.3
-endif
-ifndef LDAPCONSOLE_COMP
-  LDAPCONSOLE_COMP = directoryconsole
-endif
-ifndef LDAPCONSOLE_RELDATE
-  LDAPCONSOLE_RELDATE=$(LDAPCONSOLE_GENREL)/20060323
-endif
-
-ifndef PERLDAP_VERSION
-  PERLDAP_VERSION=1.5/20061006
-endif
-
-ifndef JSS_COMP
-  JSS_COMP=jss
-endif
-
-ifndef JSS_VERSION
-  JSS_VERSION=JSS_3_7_RTM
-endif
-
-ifndef JSS_JAR_VERSION
-  JSS_JAR_VERSION=3
-endif
-
-ifndef SASL_VERSDIR
-  SASL_VERSDIR=cyrus
-endif
-ifndef SASL_RELDATE
-  SASL_RELDATE=v2.1.20.2
-endif
-
-# jakarta/axis for DSMLGW
-ifndef AXIS_VERSION
-  AXIS_VERSION=1.2rc3
-endif
-
-# ICU
-ifndef ICU_VERSDIR
-  ICU_VERSDIR=libicu_3_4
-endif
-ifndef ICU_RELDATE
-  ICU_RELDATE=
-endif
-
-# DOC
-ifndef DSDOC_RELDATE
-  DSDOC_RELDATE = 20050311
-endif
-
-ifndef ADSYNC_VERSION
-	ADSYNC_VERSION=20060330
-endif
-
-ifndef NT4SYNC_VERSION
-	NT4SYNC_VERSION=20060330
-endif
diff --git a/components.mk b/components.mk
deleted file mode 100644
index 81975abe..00000000
--- a/components.mk
+++ /dev/null
@@ -1,688 +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
-#
-# this file contains definitions for component macros used during the build
-# process.  Things like the component location in the build tree, etc.
-# this file should be included by nsconfig.mk after it figures out all
-# of the OS, architecture, security, and other platform and build related
-# macros.  This file also contains the instructions for making the component
-# up to date e.g. copying the files from their repository to an area where
-# the build process has access to it.  For some components and OS's, this may
-# be as simple as creating a symbolic link to the repository
-
-# Each component should define a COMPONENT_DEP macro which can be used in
-# other makefiles for dependency checking e.g.
-# target: $(COMPONENT1_DEP) $(COMPONENT2_DEP) ...
-# This macro should evaluate to the name of a single file which must be
-# present for the package to be complete e.g. some library or include
-# file name
-# Each component then should define a target for that dependency which will
-# bring the component up to date if that target does not exist e.g.
-# $(COMPONENT1_DEP):
-#	use ftp or symlinks or ??? to get the necessary files to the build
-#	area
-
-# Each component should define a COMPONENT_LINK macro which can be used to
-# link the component's libraries with the target.  For NT, this will typically
-# be something like
-# /LIBPATH:path_to_library lib1 lib2 lib3 /LIBPATH:more_libs lib4 lib5 ...
-# On Unix, this will be something like
-# -Lpath_to_library -l1 -l2 -l3 -Lmore_libs -l4 -l5 ...
-
-# Each component should define a COMPONENT_INCLUDE macro which can be used
-# to compile using the component's header files e.g.
-# -Ipath_to_include_files -Ipath_to_more_include_files
-
-# Once this file is working, I will DELETE compvers.sh and ns_ftp.sh
-# from the tree, so help me god.
-
-# this macro contains a list of source files and directories to copy to
-# the directory where DLLs/SOs go at runtime; each component will add the files/dirs to
-# this macro that it needs to package; not all components will have
-# files which need packaging
-# if you need some other behavior, see PACKAGE_SRC_DEST below
-LIBS_TO_PKG =
-
-# this macro contains a list of source files and directories to copy to
-# the directory where DLLs/SOs go at runtime; each component will add the files/dirs to
-# this macro that it needs to package; this is for DLLs/SOs for the shared/bin
-# directory where the ldap c sdk command line tools, some security tools, and
-# the i18n conversion tools live
-LIBS_TO_PKG_SHARED = 
-
-# this macro contains a list of source files and directories to copy to
-# the shared tools directory - things like the ldap c sdk command line
-# tools, shared security tools, etc.
-BINS_TO_PKG_SHARED =
-
-# this macro contains a list of shared libraries/dlls needed during
-# setup to run the setup pre-install program on unix (ns-config) or
-# the slapd plugin on NT (DSINST_PreInstall)
-PACKAGE_SETUP_LIBS =
-
-# this macro contains a list of libraries/dlls to copy to the clients
-# library directory
-LIBS_TO_PKG_CLIENTS =
-
-# this macro contains a list of source files and directories to copy to
-# the release/java directory; usually a list of jar files
-PACKAGE_UNDER_JAVA =
-
-# this macro contains a list of pairs of source and dest files and directories
-# the source is where to find the item in the build tree, and the dest is
-# the place in the release to put the item, relative to the server root e.g.
-# nls locale files are in libnls31/locale, but for packaging they need to
-# go into lib/nls, not just lib; the destination should be a directory name;
-# separate the src from the dest with a single space
-PACKAGE_SRC_DEST =
-
-# this macro contains a list of pairs of source and dest files, not directories
-# the source is where to find the item in the build tree, and the dest is
-# the place in the release to put the item, relative to the server root e.g.
-# nls locale files are in libnls31/locale, but for packaging they need to
-# go into lib/nls, not just lib; the destination should be a file name;
-# separate the src from the dest with a single space
-PACKAGE_SRC_DESTFILE =
-
-# these defs are useful for doing pattern search/replace
-COMMA := ,
-NULLSTRING :=
-SPACE := $(NULLSTRING) # the space is between the ) and the #
-DS_BRAND := fedora
-
-ifeq ($(ARCH), WINNT)
-EXE_SUFFIX = .exe
-else # unix - windows has no lib name prefix, except for nspr
-LIB_PREFIX = lib
-endif
-
-ifeq ($(INTERNAL_BUILD), 1)
-include $(BUILD_ROOT)/internal_buildpaths.mk
-else
-include $(BUILD_ROOT)/buildpaths.mk
-endif
-
-# NSPR20 Library
-NSPR_LIBNAMES = plc4 plds4
-ifeq ($(ARCH), SOLARIS)
-  ifeq ($(NSPR_RELDATE), v4.2.2)
-# no need after v4.4.1
-NSPR_LIBNAMES += ultrasparc4 
-# just need ultrasparc for now
-LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,ultrasparc4))
-  endif
-endif
-NSPR_LIBNAMES += nspr4
-ifdef NSPR_SOURCE_ROOT
-  NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
-  NSPR_INCDIR = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/include
-  NSPR_LIBPATH_32 = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME_32)/lib
-  NSPR_INCDIR_32 = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME_32)/include
-else
-  NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib
-  NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
-  NSPR_LIBPATH_32 = $(NSPR_BUILD_DIR_32)/lib
-  NSPR_INCDIR_32 = $(NSPR_BUILD_DIR_32)/include
-endif
-NSPR_INCLUDE = -I$(NSPR_INCDIR)
-NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/$(LIB_PREFIX),$(NSPR_LIBNAMES)))
-
-LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG)
-LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools
-ifeq ($(USE_SETUPUTIL), 1)
-  PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG)
-endif
-ifeq ($(USE_DSGW), 1)
-  LIBS_TO_PKG_CLIENTS += $(NSPR_LIBS_TO_PKG) # for dsgw
-endif
-
-ifeq ($(ARCH), WINNT)
-  NSPRDLL_NAME = $(addprefix lib, $(NSPR_LIBNAMES))
-  NSPROBJNAME = $(addsuffix .lib, $(NSPRDLL_NAME))
-  NSPRLINK = /LIBPATH:$(NSPR_LIBPATH) $(NSPROBJNAME)
-  LIBNSPRDLL_NAMES = $(addsuffix .dll, $(addprefix $(NSPR_LIBPATH)/, \
-	$(addprefix lib, $(NSPR_LIBNAMES))))
-else
-  NSPR_SOLIBS = $(addsuffix .$(DLL_SUFFIX),  $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
-  NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES))
-  LIBNSPR = $(addprefix $(NSPR_LIBPATH)/, $(NSPR_SOLIBS))
-  NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
-endif
-
-### SECURITY #############################
-ifdef SECURITY_SOURCE_ROOT
-  SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
-  SECURITY_BINPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/bin
-  SECURITY_INCDIR = $(SECURITY_SOURCE_ROOT)/dist/public/nss
-  SECURITY_LIBPATH_32 = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME_32)/lib
-  SECURITY_BINPATH_32 = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME_32)/bin
-else
-  SECURITY_LIBPATH = $(SECURITY_BUILD_DIR)/lib
-  SECURITY_BINPATH = $(SECURITY_BUILD_DIR)/bin
-  SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
-  SECURITY_LIBPATH_32 = $(SECURITY_BUILD_DIR_32)/lib
-  SECURITY_BINPATH_32 = $(SECURITY_BUILD_DIR_32)/bin
-endif
-SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
-# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
-SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK = softokn3
-
-# these are the libs we need at runtime
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
-
-# freebl for all platforms is new for NSS 3.11
-# there are some platform specific versions as well
-FREEBL_LIBS = freebl3
-ifeq ($(USE_64), 1)
-ifeq ($(ARCH), SOLARIS)
-FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
-endif
-else  # USE_64
-ifeq ($(ARCH), SOLARIS)
-FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-endif # SOLARIS
-ifeq ($(ARCH), HPUX)
-FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
-endif # HPUX
-endif # USE_64
-
-SECURITY_LIBNAMES.pkg += $(FREEBL_LIBS)
-SECURITY_NEED_CHK += $(FREEBL_LIBS)
-
-SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES))
-SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS))
-
-SECURITY_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_LIBNAMES.pkg)))
-SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK)))
-LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
-LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
-
-ifeq ($(USE_SETUPUTIL), 1)
-  PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) # for the setup programs
-endif
-ifeq ($(USE_DSGW), 1)
-  LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw
-endif
-
-ifeq ($(ARCH), WINNT)
-  SECURITYOBJNAME = $(addsuffix .$(LIB_SUFFIX), $(SECURITY_LIBNAMES))
-  LIBSECURITY = $(addprefix $(SECURITY_LIBPATH)/, $(SECURITYOBJNAME))
-  SECURITYLINK = /LIBPATH:$(SECURITY_LIBPATH) $(SECURITYOBJNAME)
-else
-  SECURITYOBJNAME = $(addsuffix .$(DLL_SUFFIX), $(addprefix $(LIB_PREFIX), $(SECURITY_LIBNAMES)))
-  LIBSECURITY = $(addprefix $(SECURITY_LIBPATH)/, $(SECURITYOBJNAME))
-  SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES))
-endif
-
-# we need to package the root cert file in the alias directory
-PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) etc/$(DS_BRAND)-ds
-
-# the security tools are wrapped with shell scripts so that the correct ld libpath can be set
-# so, when we package them, we rename them with a -bin extension e.g. certutil -> shared/bin/certutil-bin
-# the actual certutil will be an executable shell script that points to certutil-bin
-PACKAGE_SRC_DESTFILE += $(foreach prog,$(SECURITY_TOOLS),$(SECURITY_BINPATH)/$(prog)$(SPACE)usr/bin/$(prog)-bin)
-
-### SECURITY END #############################
-
-### SVRCORE #############################
-ifdef SVRCORE_SOURCE_ROOT
-  SVRCORE_LIBPATH = $(SVRCORE_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
-  SVRCORE_INCDIR = $(SVRCORE_SOURCE_ROOT)/dist/public/svrcore
-else
-  SVRCORE_LIBPATH = $(SVRCORE_BUILD_DIR)/lib
-  SVRCORE_INCDIR = $(SVRCORE_BUILD_DIR)/include
-endif
-SVRCORE_INCLUDE = -I$(SVRCORE_INCDIR)
-SVRCORE_LIBNAMES = svrcore
-
-ifeq ($(ARCH), WINNT)
-  SVRCOREOBJNAME = $(addsuffix .lib, $(SVRCORE_LIBNAMES))
-  LIBSVRCORE = $(addprefix $(SVRCORE_LIBPATH)/, $(SVRCOREOBJNAME))
-  SVRCORELINK = /LIBPATH:$(SVRCORE_LIBPATH) $(SVRCOREOBJNAME)
-else
-  SVRCOREOBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(SVRCORE_LIBNAMES)))
-  LIBSVRCORE = $(addprefix $(SVRCORE_LIBPATH)/, $(SVRCOREOBJNAME))
-  SVRCORELINK = -L$(SVRCORE_LIBPATH) $(addprefix -l, $(SVRCORE_LIBNAMES))
-endif
-
-### SVRCORE END #############################
-
-####################################################
-# LDAP SDK
-###################################################
-
-ifdef LDAPSDK_SOURCE_ROOT
-  LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
-  LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
-  LDAPSDK_BINPATH = $(LDAPSDK_SOURCE_ROOT)/dist/bin
-# need to build in another source root ...
-  LDAPSDK_LIBPATH_32 = $(LDAPSDK_SOURCE_ROOT_32)/dist/lib
-  LDAPSDK_INCDIR_32 = $(LDAPSDK_SOURCE_ROOT_32)/dist/public/ldap
-  LDAPSDK_BINPATH_32 = $(LDAPSDK_SOURCE_ROOT_32)/dist/bin
-else
-  LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
-  LDAPSDK_INCDIR = $(LDAP_ROOT)/include
-  LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
-  LDAPSDK_LIBPATH_32 = $(LDAP_ROOT_32)/lib
-  LDAPSDK_INCDIR_32 = $(LDAP_ROOT_32)/include
-  LDAPSDK_BINPATH_32 = $(LDAP_ROOT_32)/bin
-endif
-LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
-
-# package the command line programs
-LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX))
-BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS)
-# package the include files - needed for the plugin API
-#LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h)
-#PACKAGE_SRC_DEST += $(subst $(SPACE),$(SPACE)usr/share/$(DS_BRAND)-ds/plugins/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES))
-# _datadir/brand_ds/plugins/slapi/include
-#PACKAGE_SRC_DEST += usr/share/$(DS_BRAND)-ds/plugins/slapi/include
-
-ifeq ($(ARCH), WINNT)
-  LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
-  LDAPDLL_NAME = $(addprefix ns, $(LDAP_LIBNAMES))
-  LDAPOBJNAME = $(addsuffix .$(LIB_SUFFIX), $(LDAPDLL_NAME))
-  LDAPLINK = /LIBPATH:$(LDAPSDK_LIBPATH) $(LDAPOBJNAME)
-  LDAP_NOSSL_LINK = /LIBPATH:$(LDAPSDK_LIBPATH) nsldap32v$(LDAP_SUF).$(LIB_SUFFIX)
-  LIBLDAPDLL_NAMES = $(addsuffix .dll, $(addprefix $(LDAP_LIBPATH)/, $(LDAPDLL_NAME)))
-
-  LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  ifeq ($(USE_SETUPUTIL), 1)
-    PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  endif
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  endif
-else # not WINNT
-  LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
-  ifndef LDAP_NO_LIBLCACHE
-	LDAP_SOLIB_NAMES += lcache30$(LDAP_DLL_PRESUF)
-  endif
-  LDAP_DOTALIB_NAMES =
-  LDAP_LIBNAMES = $(LDAP_DOTALIB_NAMES) $(LDAP_SOLIB_NAMES)
-  LDAP_SOLIBS = $(addsuffix .$(LDAP_DLL_SUFFIX), $(addprefix $(LIB_PREFIX), $(LDAP_SOLIB_NAMES)))
-  LDAPOBJNAME = $(addsuffix .$(LIB_SUFFIX), $(addprefix $(LIB_PREFIX), $(LDAP_DOTALIB_NAMES))) \
-		$(LDAP_SOLIBS)
-  LDAPLINK = -L$(LDAPSDK_LIBPATH) $(addprefix -l,$(LDAP_SOLIB_NAMES))
-  LDAP_NOSSL_LINK = -L$(LDAPSDK_LIBPATH) -lldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
-
-  LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  ifeq ($(USE_SETUPUTIL), 1)
-    PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  endif
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  endif
-endif
-
-LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
-LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-LDAP_TOOLDIR = $(LDAPSDK_BINPATH)
-LIBLDAP = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
-
-### SASL package ##########################################
-
-ifeq ($(ARCH), Linux)
-  ifeq ($(BUILD_ARCH), RHEL3)
-    SASL_LIBPATH = /usr/kerberos/lib
-    SASL_LINK = -L$(SASL_LIBPATH)
-  else
-# just use default linker path
-    SASL_LIBPATH = 
-    SASL_LINK = 
-  endif
-  SASL_INCDIR = /usr/include/sasl
-else
-  ifdef SASL_SOURCE_ROOT
-    SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
-    SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
-  else
-    SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
-    SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
-  endif
-  SASL_LINK = -L$(SASL_LIBPATH)
-endif
-SASL_INCLUDE = $(SASL_INCDIR)
-
-ifeq ($(ARCH), WINNT)
-  SASL_LIB_ROOT_NAME = sasl
-  SASL_LINK = /LIBPATH:$(SASL_LIBPATH) lib$(SASL_LIB_ROOT_NAME).lib
-  SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).lib,lib$(SASL_LIB_ROOT_NAME).dll,saslDIGESTMD5.dll
-else
-  # for cyrus it's sasl2
-  SASL_LIB_ROOT_NAME = sasl2
-  SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
-  ifeq ($(ARCH), Linux)
-# I don't think we need this anymore
-    GSSAPI_LIBS=
-#    GSSAPI_LIBS=-lgssapi_krb5
-  endif
-  ifeq ($(ARCH), SOLARIS)
-    GSSAPI_LIBS=-lgss
-  endif
-  ifeq ($(ARCH), HPUX)
-      GSSAPI_LIBS=-lgss
-      ifeq ($(USE_64),1)
-        GSSAPI_LIBS=-lgss
-      endif
-  endif
-
-  SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
-endif
-###########################################################
-
-### Net-SNMP package ######################################
-# given source root overrides other settings
-# otherwise, on linux, use 
-ifdef NETSNMP_SOURCE_ROOT
-  NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib
-  NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include
-  NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin
-else
-ifeq ($(ARCH), Linux)
- ifeq ($(USE_64), 1)
-    NETSNMP_LIBPATH = /usr/lib64
-  else
-    NETSNMP_LIBPATH = /usr/lib
-  endif
-  NETSNMP_INCDIR = /usr/include/net-snmp
-  NETSNMP_BINDIR = /usr/bin
-else
-  NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib
-  NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include
-  NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin
-endif
-endif
-
-NETSNMP_INCLUDE = -I$(NETSNMP_INCDIR)
-NETSNMP_LIBNAMES = netsnmp netsnmpagent netsnmpmibs netsnmphelpers
-NETSNMP_LINK = -L$(NETSNMP_LIBPATH) $(addprefix -l, $(NETSNMP_LIBNAMES))
-ifneq ($(ARCH), WINNT)
-  ifneq ($(ARCH), Linux)
-    ifeq ($(ARCH), HPUX)
-      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).7, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES)))
-    else
-      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES)))
-    endif
-    LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
-  else # Linux
-    ifdef NETSNMP_SOURCE_ROOT
-      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5.2.1, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES)))
-	  LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
-    endif # NETSNMP_SOURCE_ROOT
-  endif # Linux
-endif # WINNT
-###########################################################
-
-### ICU package ##########################################
-
-ICU_LIB_VERSION = 34
-ifdef ICU_SOURCE_ROOT
-  ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
-  ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
-  ICU_INCPATH = $(ICU_SOURCE_ROOT)/built/include
-else
-  ICU_LIBPATH = $(ICU_BUILD_DIR)/lib
-  ICU_BINPATH = $(ICU_BUILD_DIR)/bin
-  ICU_INCPATH = $(ICU_BUILD_DIR)/include
-endif
-ICU_INCLUDE = -I$(ICU_INCPATH)
-ifeq ($(ARCH), WINNT)
-  ifeq ($(BUILD_DEBUG), optimize)
-    ICU_LIB_SUF=
-  else
-    ICU_LIB_SUF=d
-  endif
-  ICU_LIBNAMES = icuin$(ICU_LIB_SUF) icuuc$(ICU_LIB_SUF) icudata
-  ICU_DLLNAMES = icuin$(ICU_LIB_VERSION)$(ICU_LIB_SUF) icuuc$(ICU_LIB_VERSION)$(ICU_LIB_SUF) icudt$(ICU_LIB_VERSION)l
-  ICULINK = /LIBPATH:$(ICU_LIBPATH) $(addsuffix .$(LIB_SUFFIX),$(ICU_LIBNAMES))
-  LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  endif
-else
-  ICU_LIBNAMES = icui18n icuuc icudata
-  ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES))
-  LIBS_TO_PKG += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  LIBS_TO_PKG_SHARED += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  endif
-#LIBS_TO_PKG = $(addsuffix $(addprefix lib,$(ICU_LIBNAMES))
-endif
-
-BINS_TO_PKG_SHARED += $(ICU_BINPATH)/uconv$(EXE_SUFFIX)
-
-###########################################################
-
-### DB component (Berkeley DB) ############################
-DB_LIBNAME=lib$(DB_MAJOR_MINOR)
-ifdef DB_SOURCE_ROOT
-  DB_INCLUDE =$(DB_SOURCE_ROOT)/built
-  DB_LIBPATH =$(DB_SOURCE_ROOT)/built/.libs
-  DB_BINPATH =$(DB_SOURCE_ROOT)/built
-else
-  DB_INCLUDE =$(db_path_config)/include
-  DB_LIBPATH =$(db_path_config)/lib
-  DB_BINPATH =$(db_path_config)/bin
-endif
-ifeq ($(ARCH), WINNT)
-  db_import_lib_suffix =$(LIB_SUFFIX)
-  DB_LIB =$(DB_LIBPATH)/$(DB_LIBNAME).$(db_import_lib_suffix)
-  DB_STATIC_LIB =$(DB_LIBPATH)/$(DB_LIBNAME).$(LIB_SUFFIX)
-else	# not WINNT
-  db_import_lib_suffix =$(DLL_SUFFIX)
-  DB_LIB =-L$(DB_LIBPATH) -l$(DB_MAJOR_MINOR)
-# XXXsspitzer: we need the spinlock symbols staticly linked in to libdb
-  DB_STATIC_LIB =-L$(DB_LIBPATH) -ldbs
-endif	# not WINNT
-
-# libdb only needs to be in the server directory since only the server uses it
-PACKAGE_SRC_DEST += $(wildcard $(DB_LIBPATH)/*.$(DLL_SUFFIX)) usr/lib/$(DS_BRAND)-ds
-
-### DB component (Berkeley DB) ############################
-
-
-###########################################
-# SETUPUTIL
-##########################################
-
-ifdef SETUPUTIL_SOURCE_ROOT
-  SETUPUTIL_LIBPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/lib
-  SETUPUTIL_INCDIR = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/include
-  SETUPUTIL_BINPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/bin
-else
-  SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
-  SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
-  SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
-endif
-SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
-
-ifeq ($(ARCH), WINNT)
-SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
-SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
-else
-SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
-SETUPUTIL_S_LINK = $(SETUPUTILLINK)
-endif
-
-# this is the base directory under which the component's files will be found
-# during the build process
-ifdef ADMINUTIL_SOURCE_ROOT
-  ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
-  ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
-else
-  ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
-  ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
-endif
-
-ifeq ($(USE_ADMINSERVER), 1)
-PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/adminutil-properties bin/slapd/lib
-LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
-LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
-endif
-
-ifeq ($(ARCH),WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil.$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s.$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX)
-else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil
-endif
-ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
-	-I$(ADMINUTIL_INCPATH)/libadmsslutil
-
-#########################################
-# LDAPJDK
-#########################################
-
-LDAPJDK = ldapjdk.jar
-ifdef LDAPJDK_SOURCE_DIR
-  LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
-endif
-ifndef LDAPJDK_DIR
-  LDAPJDK_DIR = $(CLASS_DEST)
-endif
-LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
-
-AXIS = axis-$(AXIS_VERSION).zip
-AXIS_FILES = $(AXIS)
-AXIS_FILE = $(CLASS_DEST)/$(AXIS)
-
-DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar,jakarta-commons-codec.jar
-DSMLJAR_FILE = $(CLASS_DEST)
-
-CRIMSON_LICENSE = LICENSE.crimson
-CRIMSONJAR = crimson.jar
-ifdef CRIMSON_SOURCE_DIR
-  CRIMSONJAR_BUILD_DIR = $(CRIMSON_SOURCE_DIR)
-endif
-ifndef CRIMSONJAR_BUILD_DIR
-  CRIMSONJAR_BUILD_DIR = $(CLASS_DEST)
-endif
-CRIMSONJAR_FILE = $(CRIMSONJAR_BUILD_DIR)/$(CRIMSONJAR)
-
-ifdef ADMINSERVER_SOURCE_ROOT
-  ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
-# else set in internal_buildpaths.mk
-endif
-ADMINSERVER_PKG:=admserv.tar.gz
-# these are the subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS:=admin base
-
-ifdef LDAPCONSOLE_SOURCE_ROOT
-  LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
-else
-  LDAPCONSOLE_DIR = $(CLASS_DEST)
-endif
-LDAPCONSOLEJAR = $(DS_BRAND)-ds-$(LDAPCONSOLE_REL).jar
-LDAPCONSOLEJAR_EN = $(DS_BRAND)-ds-$(LDAPCONSOLE_REL)_en.jar
-LDAPCONSOLEGENJAR = $(DS_BRAND)-ds-$(LDAPCONSOLE_GENREL).jar
-LDAPCONSOLEGENJAR_EN = $(DS_BRAND)-ds-$(LDAPCONSOLE_GENREL)_en.jar
-
-#### online help docs ######
-ifndef ONLINEHELP_SOURCE_ROOT
-  DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
-else
-  DSDOC_DIR = $(ONLINEHELP_SOURCE_ROOT)
-endif
-DSDOC_CLIENTS = slapd_clients.zip
-DSDOC_COPYRIGHT = slapd_copyright.zip
-
-########### PerLDAP #############
-ifdef PERLDAP_SOURCE_ROOT
-  PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
-# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
-  PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
-  PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
-  PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
-  # under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
-  PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) usr/lib/perl
-  PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) usr/lib/perl
-  PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) usr/lib/perl
-endif
-
-
-# 32-bit perldap is packaged in 64-bit DS on Solaris and HP-UX PA-RISC.
-# It requires 32-bit LDAPSDK, NSPR, NSS.
-ifeq ($(USE_64), 1)
-  ifeq ($(BUILD_ARCH), SOLARIS)
-    PACKAGE_LIB32:=1
-  endif
-  ifeq ($(BUILD_ARCH), HPUX)
-    HPUX_ARCH := $(shell uname -m)
-    ifneq ($(HPUX_ARCH), ia64)
-      PACKAGE_LIB32:=1
-    endif
-  endif
-endif
-
-# must define dependencies last because they depend on the definitions above
-ifeq ($(INTERNAL_BUILD), 1)
-include $(BUILD_ROOT)/internal_comp_deps.mk
-endif
-
-ifeq ($(PACKAGE_LIB32), 1)
-  NSS32_LIBNAMES = $(SECURITY_LIBNAMES) smime3
-  NSS32_NEED_CHK = softokn3
-  ifeq ($(ARCH), SOLARIS)
-    NSS32_LIBNAMES += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-# these libs have a corresponding .chk file
-    NSS32_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-  endif
-  ifeq ($(ARCH), HPUX)
-    NSS32_LIBNAMES += freebl_32fpu_3 freebl_32int_3
-# these libs have a corresponding .chk file
-    NSS32_NEED_CHK += freebl_32fpu_3 freebl_32int_3
-  endif
-  NSSCKBI_FILE = $(LIB_PREFIX)nssckbi.$(DLL_SUFFIX)
-  NSSCKBI32_FILE = $(LIB_PREFIX)nssckbi32.$(DLL_SUFFIX)
-  SECURITY_FILES_32_TMP = $(NSSCKBI_FILE) $(addprefix $(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSS32_LIBNAMES))) $(addprefix $(LIB_PREFIX),$(addsuffix .chk,$(NSS32_NEED_CHK)))
-
-  LIBS_TO_PKG_SHARED_32 = $(addprefix $(SECURITY_LIBPATH_32)/,$(SECURITY_FILES_32_TMP))
-  LIBS_TO_PKG_SHARED_32 += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH_32)/$(LIB_PREFIX),$(NSPR_LIBNAMES)))
-  LIBS_TO_PKG_SHARED_32 += $(addprefix $(LDAPSDK_LIBPATH_32)/,$(LDAP_SOLIBS))
-endif # PACKAGE_LIB32
-
diff --git a/config/HP-UX.mk b/config/HP-UX.mk
deleted file mode 100644
index 050d035f..00000000
--- a/config/HP-UX.mk
+++ /dev/null
@@ -1,114 +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
-#
-#
-# Config stuff for HP-UX.09.03
-#
-
-CC			= cc -Ae
-CCC			= CC -Aa +a1 +eh
-RANLIB			= echo
-
-CPU_ARCH		= hppa
-OS_LIBS			= -ldld -lm -ldce
-OS_CFLAGS		= $(SERVER_CFLAGS) $(DSO_CFLAGS) -DHAVE_STRERROR -DHPUX -D$(CPU_ARCH) -DSW_THREADS -D_HPUX_SOURCE $(ADDITIONAL_CFLAGS)
-ELIBS_CFLAGS		= -g -DHAVE_STRERROR
-
-ifeq ($(OS_RELEASE),A.09.03)
-OS_CFLAGS		+= -DHPUX9
-endif
-
-ifeq ($(OS_RELEASE),B.10.01)
-OS_CFLAGS		+= -DRW_NO_OVERLOAD_SCHAR -DHPUX10
-endif
-
-ifeq ($(OS_RELEASE),B.10.10)
-OS_CFLAGS		+= -DRW_NO_OVERLOAD_SCHAR -DHPUX10 -DHPUX10_10
-endif
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-DLL_SUFFIX		= sl
-
-LOCALE_MAP		= $(DEPTH)/cmd/xfe/intl/hpux.lm
-
-EN_LOCALE		= american.iso88591
-DE_LOCALE		= german.iso88591
-FR_LOCALE		= french.iso88591
-JP_LOCALE		= japanese.euc
-SJIS_LOCALE		= japanese
-KR_LOCALE		= korean
-CN_LOCALE		= chinese-s
-TW_LOCALE		= chinese-t.big5
-I2_LOCALE		= i2
-IT_LOCALE		= it
-SV_LOCALE		= sv
-ES_LOCALE		= es
-NL_LOCALE		= nl
-PT_LOCALE		= pt
-
-LOC_LIB_DIR		= /usr/lib/X11
-
-# HPUX doesn't have a BSD-style echo, so this home-brewed version will deal
-# with '-n' instead.
-BSDECHO			= /usr/local/bin/bsdecho
-
-#
-# These defines are for building unix plugins
-#
-BUILD_UNIX_PLUGINS	= 1
-DSO_LDOPTS		= -b
-DSO_LDFLAGS		=
-DSO_CFLAGS		= +z
-
-ifdef SERVER_BUILD
-  ifeq ($(OS_RELEASE),B.11.23)
-    ifdef USE_64
-      SERVER_CFLAGS           = +DD64 -Wl,-E,-N
-    else
-      SERVER_CFLAGS           = +DD32 -Wl,-E,-N
-    endif
-else
-    ifdef USE_64
-      SERVER_CFLAGS		= +DA2.0W +DS2.0 -Wl,-E,-N
-    else
-      SERVER_CFLAGS		= +DA1.0 -Wl,-E,-N
-    endif
-endif
-STATIC_JAVA		= yes
-endif
diff --git a/config/HP-UXB.11.11.mk b/config/HP-UXB.11.11.mk
deleted file mode 100644
index 427c2698..00000000
--- a/config/HP-UXB.11.11.mk
+++ /dev/null
@@ -1,43 +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
-#
-#
-# Config stuff for HP-UX.11.00
-#
-include $(DEPTH)/config/HP-UX.mk
diff --git a/config/HP-UXB.11.23.mk b/config/HP-UXB.11.23.mk
deleted file mode 100644
index bce4c61a..00000000
--- a/config/HP-UXB.11.23.mk
+++ /dev/null
@@ -1,43 +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) 2006 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Config stuff for HP-UX.11.23
-#
-include $(DEPTH)/config/HP-UX.mk
diff --git a/config/Linux2.4.mk b/config/Linux2.4.mk
deleted file mode 100644
index 7ddc0f15..00000000
--- a/config/Linux2.4.mk
+++ /dev/null
@@ -1,90 +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
-#
-#
-# Config stuff for Linux2.4
-#
-
-#include $(NSPRDEPTH)/config/UNIX.mk
-
-CC 		= gcc
-CCC 		= g++
-
-CPU_ARCH	= x86
-GFX_ARCH	= x
-
-RANLIB 		= ranlib
-
-ifdef SERVER_BUILD
-# see sun-java/config/config.mk
-STATIC_JAVA = yes
-endif
-
-NEED_XMOS = 1
-
-# fixme OS_CFLAGS = -m486 -ansi -Wall -pipe -MDupdate $(DEPENDENCIES)
-OS_CFLAGS = -m486 -ansi -Wall -pipe
-
-OS_CFLAGS += -DLINUX -DLINUX2_4 -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -D_REENTRANT
-OS_LIBS = -L /lib -lc -ldl -lpthread
-
-ARCH = linux
-
-EN_LOCALE = C
-DE_LOCALE = de_DE.ISO8859-1
-FR_LOCALE = fr_FR.ISO8859-1
-JP_LOCALE = ja
-SJIS_LOCALE = ja_JP.SJIS
-KR_LOCALE = ko_KR.EUC
-CN_LOCALE = zh
-TW_LOCALE = zh
-I2_LOCALE = i2
-
-BUILD_UNIX_PLUGINS = 1
-
-ifeq ($(OS_RELEASE),2.4)
-OS_REL_CFLAGS         += -DLINUX2_4
-MKSHLIB			= $(LD) -shared
-endif
-
-XINC = /usr/X11R6/include
-INCLUDES += -I$(XINC)
-
-BSDECHO	= echo
-
diff --git a/config/Linux2.6.mk b/config/Linux2.6.mk
deleted file mode 100644
index 7ddc0f15..00000000
--- a/config/Linux2.6.mk
+++ /dev/null
@@ -1,90 +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
-#
-#
-# Config stuff for Linux2.4
-#
-
-#include $(NSPRDEPTH)/config/UNIX.mk
-
-CC 		= gcc
-CCC 		= g++
-
-CPU_ARCH	= x86
-GFX_ARCH	= x
-
-RANLIB 		= ranlib
-
-ifdef SERVER_BUILD
-# see sun-java/config/config.mk
-STATIC_JAVA = yes
-endif
-
-NEED_XMOS = 1
-
-# fixme OS_CFLAGS = -m486 -ansi -Wall -pipe -MDupdate $(DEPENDENCIES)
-OS_CFLAGS = -m486 -ansi -Wall -pipe
-
-OS_CFLAGS += -DLINUX -DLINUX2_4 -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -D_REENTRANT
-OS_LIBS = -L /lib -lc -ldl -lpthread
-
-ARCH = linux
-
-EN_LOCALE = C
-DE_LOCALE = de_DE.ISO8859-1
-FR_LOCALE = fr_FR.ISO8859-1
-JP_LOCALE = ja
-SJIS_LOCALE = ja_JP.SJIS
-KR_LOCALE = ko_KR.EUC
-CN_LOCALE = zh
-TW_LOCALE = zh
-I2_LOCALE = i2
-
-BUILD_UNIX_PLUGINS = 1
-
-ifeq ($(OS_RELEASE),2.4)
-OS_REL_CFLAGS         += -DLINUX2_4
-MKSHLIB			= $(LD) -shared
-endif
-
-XINC = /usr/X11R6/include
-INCLUDES += -I$(XINC)
-
-BSDECHO	= echo
-
diff --git a/config/SunOS5.8.mk b/config/SunOS5.8.mk
deleted file mode 100644
index 603edcfd..00000000
--- a/config/SunOS5.8.mk
+++ /dev/null
@@ -1,46 +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
-#
-#
-# Config stuff for SunOS5.8
-#
-
-SOL_CFLAGS	= -D_SVID_GETTOD -DSOLARIS_55_OR_GREATER
-
-include $(DEPTH)/config/SunOS5.mk
diff --git a/config/SunOS5.8_i86pc.mk b/config/SunOS5.8_i86pc.mk
deleted file mode 100644
index 603edcfd..00000000
--- a/config/SunOS5.8_i86pc.mk
+++ /dev/null
@@ -1,46 +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
-#
-#
-# Config stuff for SunOS5.8
-#
-
-SOL_CFLAGS	= -D_SVID_GETTOD -DSOLARIS_55_OR_GREATER
-
-include $(DEPTH)/config/SunOS5.mk
diff --git a/config/SunOS5.9.mk b/config/SunOS5.9.mk
deleted file mode 100644
index 25161fcf..00000000
--- a/config/SunOS5.9.mk
+++ /dev/null
@@ -1,46 +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
-#
-#
-# Config stuff for SunOS5.9
-#
-
-SOL_CFLAGS	= -D_SVID_GETTOD -DSOLARIS_55_OR_GREATER
-
-include $(DEPTH)/config/SunOS5.mk
diff --git a/config/SunOS5.mk b/config/SunOS5.mk
deleted file mode 100644
index b893c8c5..00000000
--- a/config/SunOS5.mk
+++ /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
-#
-#
-# Config stuff for SunOS5.x
-#
-
-ifdef NS_USE_NATIVE
-CC			= cc -DNS_USE_NATIVE
-CCC			= CC -DNS_USE_NATIVE
-ASFLAGS			+= -Wa,-P
-OS_CFLAGS		= $(NOMD_OS_CFLAGS)
-ifdef BUILD_OPT
-OPTIMIZER   = -xcg89 -dalign -xO2
-endif
-else
-CC			= gcc -Wall -Wno-format
-CCC			= g++ -Wall -Wno-format
-ASFLAGS			+= -x assembler-with-cpp
-ifdef NO_MDUPDATE
-OS_CFLAGS		= $(NOMD_OS_CFLAGS)
-else
-OS_CFLAGS		= $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
-endif
-endif
-
-RANLIB			= echo
-
-CPU_ARCH		= sparc
-GFX_ARCH		= x
-
-MOZ_CFLAGS		= -DSVR4 -DSYSV -DNSPR -D__svr4 -D__svr4__ -DSOLARIS -DHAVE_WEAK_IO_SYMBOLS
-
-ifeq ($(SERVER_BUILD),1)
-USE_KERNEL_THREADS	= 1
-endif
-
-ifeq ($(FORCE_SW_THREADS),1)
-USE_KERNEL_THREADS	= 0
-endif
-
-# Purify doesn't like -MDupdate
-ifeq ($(USE_KERNEL_THREADS), 1)
-NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS)
-OS_LIBS			= -lthread -lposix4 -lsocket -lnsl -ldl
-else
-NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -DSW_THREADS $(SOL_CFLAGS)
-OS_LIBS			= -lsocket -lnsl -ldl -L/tools/ns/lib -lposix4
-endif
-
-ifeq ($(OS_RELEASE),5.3)
-MOTIF			= /usr/local/Motif/opt/ICS/Motif/usr
-MOTIFLIB		= $(MOTIF)/lib/libXm.a
-else
-MOTIF			= /usr/dt
-MOTIFLIB		= -lXm
-endif
-
-INCLUDES		+= -I$(MOTIF)/include -I/usr/openwin/include
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-#Livewire httpdlw.so is using CC to link.
-LWMKSHLIB		= $(CCC) $(DSO_LDOPTS)
-
-HAVE_PURIFY		= 1
-
-NOSUCHFILE		= /solaris-rm-f-sucks
-
-LOCALE_MAP		= $(DEPTH)/cmd/xfe/intl/sunos.lm
-
-EN_LOCALE		= en_US
-DE_LOCALE		= de
-FR_LOCALE		= fr
-JP_LOCALE		= ja
-SJIS_LOCALE		= ja_JP.SJIS
-KR_LOCALE		= ko
-CN_LOCALE		= zh
-TW_LOCALE		= zh_TW
-I2_LOCALE		= i2
-IT_LOCALE		= it
-SV_LOCALE		= sv
-ES_LOCALE		= es
-NL_LOCALE		= nl
-PT_LOCALE		= pt
-
-LOC_LIB_DIR		= /usr/openwin/lib/locale
-
-BSDECHO			= /usr/ucb/echo
-
-#
-# These defines are for building unix plugins
-#
-BUILD_UNIX_PLUGINS	= 1
-DSO_LDOPTS		= -G -L$(MOTIF)/lib -L/usr/openwin/lib
-DSO_LDFLAGS		=
diff --git a/config/UNIX.mk b/config/UNIX.mk
deleted file mode 100644
index c95cfd89..00000000
--- a/config/UNIX.mk
+++ /dev/null
@@ -1,46 +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
-#
-# A small start on what nspr20/config did
-XP_DEFINE	= -DXP_UNIX
-LIB_SUFFIX	= a
-#
-DLL_SUFFIX	= so
-AR		= ar cr $@
-
diff --git a/config/WINNT5.0.mk b/config/WINNT5.0.mk
deleted file mode 100644
index 17af9c6e..00000000
--- a/config/WINNT5.0.mk
+++ /dev/null
@@ -1,88 +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
-#
-#
-# Config stuff for WINNT 5.0
-#
-
-CC=cl
-CCC=cl
-LINK = link
-RANLIB = echo
-BSDECHO = echo
-
-OTHER_DIRT = 
-GARBAGE = vc20.pdb
-
-ifdef DEBUG_RUNTIME
-RTLIBFLAGS:=-MDd
-else
-RTLIBFLAGS:=-MD
-endif
-
-PROCESSOR := $(shell uname -p)
-USE_KERNEL_THREADS=1
-_PR_USECPU=1
-ifeq ($(PROCESSOR), I386)
-CPU_ARCH = x386
-OS_CFLAGS = $(OPTIMIZER) -GT $(RTLIBFLAGS) -W3 -nologo -D_X86_ -Dx386 -D_WINDOWS -DWIN32 -DHW_THREADS
-else 
-ifeq ($(PROCESSOR), MIPS)
-CPU_ARCH = MIPS
-#OS_CFLAGS = $(OPTIMIZER) $(RTLIBFLAGS) -W3 -nologo -D_MIPS_ -D_WINDOWS -DWIN32 -DHW_THREADS
-OS_CFLAGS = $(OPTIMIZER) $(RTLIBFLAGS) -W3 -nologo -D_WINDOWS -DWIN32 -DHW_THREADS
-else 
-ifeq ($(PROCESSOR), ALPHA)
-CPU_ARCH = ALPHA
-OS_CFLAGS = $(OPTIMIZER) $(RTLIBFLAGS) -W3 -nologo -D_ALPHA_=1 -D_WINDOWS -DWIN32 -DHW_THREADS
-else 
-CPU_ARCH = processor_is_undefined
-endif
-endif
-endif
-
-ifeq ($(SERVER_BUILD), 1)
-OS_CFLAGS += -DSERVER_BUILD
-endif
-
-OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS -MAP -PDB:NONE
-OS_LFLAGS = -nologo -PDB:NONE -INCREMENT:NO -SUBSYSTEM:console
-OS_LIBS = kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib
-
-OS_DEFS= SERVER_BUILD=$(SERVER_BUILD) NSPR_VERSION=$(VERSION) NS_PRODUCT=$(NS_PRODUCT)
diff --git a/config/config.mk b/config/config.mk
deleted file mode 100644
index 3ede1ed1..00000000
--- a/config/config.mk
+++ /dev/null
@@ -1,531 +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
-#
-#! gmake
-
-include $(DEPTH)/config/common.mn
-
-#
-# Important internal static macros
-#
-OS_ARCH		:= $(subst /,_,$(shell uname -s))
-OS_TEST		:= $(shell uname -m)
-
-# Force the IRIX64 machines to use IRIX.
-ifeq ($(OS_ARCH),IRIX64)
-OS_ARCH		:= IRIX
-endif
-
-# Attempt to differentiate between SunOS 5.4 and x86 5.4
-ifeq ($(OS_TEST),i86pc)
-OS_RELEASE	:= $(shell uname -r)_$(OS_TEST)
-else
-OS_RELEASE	:= $(shell uname -r)
-endif
-
-ifeq ($(OS_ARCH),AIX)
-OS_RELEASE	:= $(shell uname -v).$(shell uname -r)
-endif
-
-# SINIX changes name to ReliantUNIX with 5.43
-ifeq ($(OS_ARCH),ReliantUNIX-N)
-OS_ARCH		:= ReliantUNIX
-OS_RELEASE	:= 5.4
-endif
-ifeq ($(OS_ARCH),SINIX-N)
-OS_ARCH		:= ReliantUNIX
-OS_RELEASE	:= 5.4
-endif
-
-# SVR5 (UnixWare[7])
-ifeq ($(OS_ARCH),UnixWare)
-# For now get the OS release for backward compatibility (UnixWare5)
-OS_RELEASE    := $(shell uname -r)
-endif
-
-# Catch NCR butchering of SVR4
-ifeq ($(OS_ARCH),UNIX_SV)
-ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),)
-OS_ARCH		:= NCR
-OS_RELEASE	:= $(shell uname -v)
-else # !NCR
-# Make UnixWare something human readable
-OS_ARCH               := UNIXWARE
-# Check for UW2 using UDK, which looks like a Gemini (UnixWare[3,5,7]) build
-OS_RELEASE    := $(shell $(DEPTH)/netsite/nsarch -f | sed 's/UnixWare //')
-ifeq ($(OS_RELEASE),5)
-OS_ARCH               := UnixWare
-else # OS_RELEASE = 5
-# Get the OS release number, not 4.2
-OS_RELEASE    := $(shell uname -v)
-ifeq ($(OS_RELEASE),2.1.2)
-OS_RELEASE    := 2.1
-endif # OS_RELEASE = 2.1.2
-endif # OS_RELEASE = 5
-endif # !NCR
-endif # UNIX_SV
-
-
-ifeq ($(OS_ARCH),Linux)
-#
-# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 and 2.2.14-5.0smp
-#
-ifeq (,$(filter-out Linux FreeBSD,$(NSOS_ARCH)))
- OS_RELEASE  := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
-endif
-# If the release returned by uname has _4_ components, the original
-# logic here broke. The following lines detect this and add a second
-# 'basename' to fixup the version such that everything still works.
-OS_RELEASE_TEMP := $(subst ., ,$(OS_RELEASE))
-OS_RELEASE_COUNT := $(words $(OS_RELEASE_TEMP))
-ifeq ($(OS_RELEASE_COUNT), 4)
-    OS_RELEASE := $(basename $(OS_RELEASE))
-endif
-OS_RELEASE := $(basename $(OS_RELEASE))
-  ifeq (86,$(findstring 86,$(OS_TEST)))
-    CPU_TAG = _x86
-  else
-    CPU_TAG = _$(OS_TEST)
-  endif
-  ifeq ($(USE_LIBC),1)
-    LIBC_TAG = _libc
-  else
-    LIBC_TAG = _glibc
-  endif
-# always use pthreads
-  USE_PTHREADS = 1
-  ifeq ($(USE_PTHREADS),1)
-    IMPL_STRATEGY = _PTH
-  endif
-  ifeq ($(USE_EGCS),1)
-    COMPILER_TAG = _egcs
-  endif
-endif
-
-# Clean up SCO
-ifeq ($(OS_ARCH),SCO_SV)
-OS_ARCH         := SCOOS
-ifeq (5.0,$(findstring 5.0,$(shell ls /var/opt/K/SCO/Unix)))
-OS_RELEASE      := 5.0
-else
-OS_RELEASE      := UNKNOWN
-endif
-endif
-
-# Furnish the extra libraries for using ld on OSF1 
-ifeq ($(OS_ARCH),OSF1)
-LDEXTRA		:= -lcxx -lexc -lc
-#
-# Distinguish between OSF1 V4.0B and V4.0D
-#
-ifeq ($(OS_RELEASE),V4.0)
-	OS_VERSION := $(shell uname -v)
-	ifeq ($(OS_VERSION),564)
-		OS_RELEASE := V4.0B
-	endif
-	ifeq ($(OS_VERSION),878)
-		OS_RELEASE := V4.0D
-	endif
-endif
-else
-LDEXTRA		:=
-endif
-
-# Relative pathname from top-of-tree to current source directory
-ifneq ($(OS_ARCH),WINNT)
-REVDEPTH	:= $(DEPTH)/config/revdepth
-SRCDIR		:= $(shell perl $(REVDEPTH).pl $(DEPTH))
-endif
-
-# define an include-at-most-once flag
-NS_CONFIG_MK	= 1
-
-#
-# Default command macros; can be overridden in <arch>.mk.
-#
-AS		= $(CC)
-ASFLAGS		= $(CFLAGS)
-CCF		= $(CC) $(CFLAGS)
-PURIFY		= purify $(PURIFYOPTIONS)
-LINK_EXE	= $(LINK) $(OS_LFLAGS) $(LFLAGS)
-LINK_DLL	= $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
-NFSPWD		= $(DEPTH)/config/nfspwd
-
-ifeq ($(OS_ARCH),WINNT)
-RC		= rc.exe
-XP_DEFINE	= -DXP_PC
-LIB_SUFFIX	= lib
-DLL_SUFFIX	= dll
-AR		= lib -NOLOGO -OUT:"$@"
-DLLFLAGS	= $(XLFLAGS) -OUT:"$@"
-LFLAGS		= $(OBJS) $(DEPLIBS) $(EXTRA_LIBS) -OUT:"$@"
-NSINSTALL	= nsinstall
-INSTALL		= $(NSINSTALL)
-else
-include $(DEPTH)/config/UNIX.mk
-endif
-
-ifdef BUILD_OPT
-ifeq ($(OS_ARCH),WINNT)
-OPTIMIZER	= -O2
-XCFLAGS		= $(LCFLAGS)
-XLFLAGS		= $(LLFLAGS)
-else
-OPTIMIZER	= -O
-JAVA_OPTIMIZER	= -O
-DEFINES		= -UDEBUG -DNDEBUG -DTRIMMED
-endif
-OBJDIR_TAG	= _OPT
-else
-ifeq ($(OS_ARCH),WINNT)
-OPTIMIZER	= -Od -Z7
-LDFLAGS		= -DEBUG
-
-XCFLAGS		= $(LCFLAGS)
-XLFLAGS		= -DEBUG $(LLFLAGS)
-XBCFLAGS	= -FR$*
-JAVA_OPTIMIZER	= -Od -Z7
-else
-ifeq ($(ARCH), ReliantUNIX)
-OPTIMIZER	= -gdwarf
-JAVA_OPTIMIZER	= -gdwarf
-else
-OPTIMIZER	= -g
-JAVA_OPTIMIZER	= -g
-endif
-ifeq ($(OS_ARCH),OSF1)
-DEFINES		= -DDEBUG_$(shell whoami) -DTRACING
-else
-DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -DTRACING
-endif
-endif
-OBJDIR_TAG	= _DBG
-endif
-
-LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
-LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
-LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
-LIBNSPR		= $(DIST)/lib/libnspr.$(LIB_SUFFIX)
-PURELIBNSPR	= $(DIST)/lib/libpurenspr.$(LIB_SUFFIX)
-
-ifeq ($(OS_ARCH),WINNT)
-LIBNSJAVA	= $(DIST)/lib/jrt3221.$(LIB_SUFFIX)
-else
-LIBNSJAVA	= $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
-endif
-
-
-# XXX For now, we're including $(DEPTH)/include directly instead of 
-# getting this stuff from dist. This stuff is old and will eventually 
-# be put in the library directories where it belongs so that it can 
-# get exported to dist properly.
-INCLUDES	= $(LOCAL_PREINCLUDES) -I$(DEPTH)/include $(LOCAL_INCLUDES)
-
-CFLAGS		= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-# For purify
-NOMD_CFLAGS	= $(XP_DEFINE) $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
-#
-# To build on SunOS5.8 when some SunOS5.8 components or config
-# files are missing, just pretend you're on SunOS5.6 by setting
-#   NSOS_RELEASE_OVERRIDE=5.6
-#
-ifdef NSOS_RELEASE_OVERRIDE
-OS_RELEASE := $(NSOS_RELEASE_OVERRIDE)
-endif
-
-
-include $(DEPTH)/config/$(OS_ARCH)$(OS_RELEASE).mk
-
-OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
-
-include $(DEPTH)/config/$(OS_CONFIG).mk
-
-# now take care of default GCC (rus@5/5/97)
-
-ifdef NS_USE_GCC
-# if gcc-settings are redefined already - don't touch it
-# 
-ifeq (,$(findstring gcc, $(CC)))
-CC	= gcc
-CCC	= g++
-CXX	= g++
-# always use -fpic - some makefiles are still broken and don't distinguish
-# situation when they build shared and static libraries
-CFLAGS	+= -fpic -Wall -DNS_USE_GCC $(GCC_FLAGS_EXTRA)
-OS_LIBS += -L/usr/local/lib -lstdc++ -lg++ -lgcc
-endif
-endif
-###
-
-# Name of the binary code directories
-ifeq ($(OS_ARCH),WINNT)
-ifneq ($(PROCESSOR_ARCHITECTURE),x86)
-OBJDIR_NAME	= $(OS_CONFIG)$(PROCESSOR_ARCHITECTURE)$(OBJDIR_TAG).OBJ
-else
-OBJDIR_NAME	= $(OS_CONFIG)$(OBJDIR_TAG).OBJ
-endif
-else   # WINNT
-ifeq ($(OS_ARCH),Linux)
-OBJDIR_NAME     = $(OS_CONFIG)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
-else
-ifeq ($(OS_ARCH), IRIX)
- ifeq ($(USE_PTHREADS), 1)
-  ifeq ($(USE_N32), 1)
-   OBJDIR_NAME   = $(OS_CONFIG)_n32_PTH$(OBJDIR_TAG).OBJ
-  else
-   OBJDIR_NAME   = $(OS_CONFIG)_PTH$(OBJDIR_TAG).OBJ
-  endif
- else
-  OBJDIR_NAME   = $(OS_CONFIG)$(OBJDIR_TAG).OBJ
- endif
-else
- OBJDIR_NAME   = $(OS_CONFIG)$(OBJDIR_TAG).OBJ
-endif	# IRIX
-endif   # Linux
-endif   # WINNT
-
-# Figure out where the binary code lives. It either lives in the src
-# tree (NSBUILDROOT is undefined) or somewhere else.
-ifdef NSBUILDROOT
-BUILD		= $(NSBUILDROOT)/$(OBJDIR_NAME)/build
-OBJDIR		= $(BUILD)/$(SRCDIR)
-XPDIST		= $(NSBUILDROOT)
-DIST		= $(NSBUILDROOT)/$(OBJDIR_NAME)/dist
-else
-BUILD		= $(OBJDIR_NAME)
-OBJDIR		= $(OBJDIR_NAME)
-XPDIST		= $(DEPTH)/dist
-DIST		= $(DEPTH)/dist/$(OBJDIR_NAME)
-endif
-
-# all public include files go in subdirectories of PUBLIC:
-PUBLIC		= $(XPDIST)/public
-
-VPATH		= $(OBJDIR)
-DEPENDENCIES	= $(OBJDIR)/.md
-
-# Personal makefile customizations go in these optional make include files.
-MY_CONFIG	= $(DEPTH)/config/myconfig.mk
-MY_RULES	= $(DEPTH)/config/myrules.mk
-
--include $(MY_CONFIG)
-
-######################################################################
-
-# Specify that we are building a client.
-# This will instruct the cross platform libraries to
-# include all the client specific cruft.
-ifndef SERVER_BUILD
-ifndef LIVEWIRE
-DEFINES += -DMOZILLA_CLIENT -DNETSCAPE
-endif
-else
-DEFINES += -DSERVER_BUILD
-endif
-DEFINES += -DNETSCAPE
-
-# Now test variables that might have been set or overridden by $(MY_CONFIG).
-
-# if ((BUILD_EDITOR || BUILD_EDT) && !NO_EDITOR) -> -DEDITOR is defined
-ifndef NO_EDITOR
-ifdef BUILD_EDITOR
-OBJDIR_TAG	:= $(OBJDIR_TAG)_EDT
-DEFINES		+= -DEDITOR -DGOLD
-# This is the product classification not the feature classification.
-# It effects things like where are the release notes, etc..
-BUILD_GOLD = yea
-else
-# We ought to get rid of this now that BUILD_EDITOR has replaced it.
-ifdef BUILD_EDT
-OBJDIR_TAG	:= $(OBJDIR_TAG)_EDT
-DEFINES		+= -DEDITOR -DGOLD
-BUILD_EDITOR	= yea
-endif 
-endif 
-endif
-
-# Build layers by default
-ifndef NO_LAYERS
-DEFINES		+= -DLAYERS
-endif
-
-# if (BUILD_EDITOR_UI && !NO_EDITOR_UI) -> -DEDITOR_UI is defined
-ifdef BUILD_EDITOR_UI
-ifndef NO_EDITOR_UI
-DEFINES		+= -DEDITOR_UI
-endif
-endif
-
-ifdef BUILD_DEBUG_GC
-DEFINES		+= -DDEBUG_GC
-endif
-
-ifdef BUILD_UNIX_PLUGINS
-# UNIX_EMBED Should not be needed. For now these two defines go
-# together until I talk with jg.  --dp
-DEFINES         += -DUNIX_EMBED -DX_PLUGINS
-endif
-
-ifndef NO_UNIX_LDAP
-DEFINES 	+= -DUNIX_LDAP
-endif
-
-#
-# Platform dependent switching off of NSPR and JAVA
-#
-ifndef NO_NSPR
-DEFINES		+= -DNSPR
-endif
-
-ifndef NO_JAVA
-DEFINES		+= -DJAVA
-endif
-
-ifeq ($(LW_JAVA), 1)
-DEFINES += -DJAVA
-endif
-
-######################################################################
-
-GARBAGE		= $(DEPENDENCIES) core
-
-ifneq ($(OS_ARCH),WINNT)
-NSINSTALL	= $(DEPTH)/config/$(OBJDIR_NAME)/nsinstall
-
-ifeq ($(NSDISTMODE),copy)
-# copy files, but preserve source mtime
-INSTALL		= $(NSINSTALL) -t
-else
-ifeq ($(NSDISTMODE),absolute_symlink)
-# install using absolute symbolic links
-INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
-else
-# install using relative symbolic links
-INSTALL		= $(NSINSTALL) -R
-endif
-endif
-endif
-
-ifndef PLATFORM_HOSTS
-PLATFORM_HOSTS	=		\
-		  atm		\
-		  bsdi		\
-		  diva		\
-		  gunwale	\
-		  openwound	\
-		  server2	\
-		  server3	\
-		  server9	\
-		  zot		\
-		  $(NULL)
-endif
-
-######################################################################
-
-# always copy files for the sdk
-SDKINSTALL	= $(NSINSTALL) -t
-
-ifndef SDK
-SDK		= $(DEPTH)/dist/sdk
-endif
-
-######################################################################
-### Java Stuff
-######################################################################
-## java interpreter
-
-JAVA_PROG = java	# from the ether
-
-# Let user over-ride CLASSPATH from environment
-#ifdef xCLASSPATH	# bad idea
-#JAVA_CLASSPATH = $(CLASSPATH)
-#else
-# keep sun-java/classsrc until bootstrapped
-#JAVA_CLASSPATH = $(XPDIST)/classes:$(DEPTH)/sun-java/classsrc
-#endif
-
-#JAVA_FLAGS = -classpath $(JAVA_CLASSPATH) -ms8m
-#JAVA = $(JAVA_PROG) $(JAVA_FLAGS) 
-
-######################################################################
-## java compiler
-# XXX - ram included from common.mn
-#JAVAC_PROG = javac	# from the ether
-#JAVAC_FLAGS = -classpath $(JAVAC_CLASSPATH) $(JAVA_OPTIMIZER)
-#JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS)
-
-PATH_SEPARATOR	= :
-
-#
-# The canonical classpath for building java libraries
-# includes these two entries first, then any additional zips
-# or directories
-#
-# see "JAVAC_CLASSPATH" in common.mn
-#
-
-# where the bytecode will go
-JAVA_DESTPATH	= $(XPDIST)/classes
-# where the sources for the module you are compiling are
-# default is sun-java/classsrc, override for other modules
-JAVA_SOURCEPATH	= $(DEPTH)/sun-java/classsrc
-
-######################################################################
-## javadoc
-
-# Rules to build java .html files from java source files
-
-JAVADOC_PROG = $(JAVA) sun.tools.javadoc.Main
-JAVADOC_FLAGS = -classpath $(JAVAC_CLASSPATH)
-JAVADOC = $(JAVADOC_PROG) $(JAVADOC_FLAGS)
-
-######################################################################
-## zip
-
-ZIP_PROG = zip
-ZIP_FLAGS = -0rq
-ZIP = $(ZIP_PROG) $(ZIP_FLAGS)
-
-######################################################################
-JRTDLL		= libjrt.$(DLL_SUFFIX)
-MMDLL		= libmm32$(VERSION_NUMBER).$(DLL_SUFFIX)
-AWTDLL		= libawt.$(DLL_SUFFIX)
-JITDLL		= libjit
-
diff --git a/config/rules.mk b/config/rules.mk
deleted file mode 100644
index 6ffd2d6a..00000000
--- a/config/rules.mk
+++ /dev/null
@@ -1,725 +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
-#
-################################################################################
-# Wow this is complicated! The story is that we now have a 4 pass build process:
-#
-# Pass 1. export - Create generated headers and stubs. Publish public headers to
-#		dist/<arch>/include.
-#
-# Pass 2. libs - Create libraries. Publish libraries to dist/<arch>/lib.
-#
-# Pass 3. all - Create programs. 
-#
-# Pass 4. install - Publish programs to dist/<arch>/bin.
-#
-# Parameters to this makefile (set these before including):
-#
-# a)
-#	TARGETS	-- the target to create 
-#			(defaults to $LIBRARY $PROGRAM)
-# b)
-#	DIRS	-- subdirectories for make to recurse on
-#			(the 'all' rule builds $TARGETS $DIRS)
-# c)
-#	CSRCS, CPPSRCS -- .c and .cpp files to compile
-#			(used to define $OBJS)
-# d)
-#	PROGRAM	-- the target program name to create from $OBJS
-#			($OBJDIR automatically prepended to it)
-# e)
-#	LIBRARY	-- the target library name to create from $OBJS
-#			($OBJDIR automatically prepended to it)
-# f)
-#	JSRCS	-- java source files to compile into class files
-#			(if you don't specify this it will default to *.java)
-#	PACKAGE	-- the package to put the .class files into
-#			(e.g. netscape/applet)
-#	JMC_EXPORT -- java files to be exported for use by JMC_GEN
-#			(this is a list of Class names)
-# g)
-#	JRI_GEN	-- files to run through javah to generate headers and stubs
-#			(output goes into the _jri sub-dir)
-# h)
-#	JMC_GEN	-- files to run through jmc to generate headers and stubs
-#			(output goes into the _jmc sub-dir)
-#
-################################################################################
-
-#
-# Common rules used by lots of makefiles...
-#
-ifndef NS_CONFIG_MK
-include $(DEPTH)/config/config.mk
-endif
-
-ifdef PROGRAM
-PROGRAM		:= $(addprefix $(OBJDIR)/, $(PROGRAM))
-endif
-
-ifndef LIBRARY
-ifdef LIBRARY_NAME
-LIBRARY		:= lib$(LIBRARY_NAME).$(LIB_SUFFIX)
-endif
-endif
-
-ifdef LIBRARY
-LIBRARY		:= $(addprefix $(OBJDIR)/, $(LIBRARY))
-ifdef MKSHLIB
-SHARED_LIBRARY	:= $(LIBRARY:.$(LIB_SUFFIX)=$(DLL_PRESUF).$(DLL_SUFFIX))
-endif
-endif
-
-ifndef TARGETS
-TARGETS		= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM)
-endif
-
-ifndef OBJS
-OBJS		= $(JRI_STUB_CFILES) $(addsuffix .o, $(JMC_GEN)) $(CSRCS:.c=.o) $(CPPSRCS:.cpp=.o) $(ASFILES:.s=.o)
-endif
-
-ifdef OBJS
-OBJS		:= $(addprefix $(OBJDIR)/, $(OBJS))
-endif
-
-ifdef REQUIRES
-MODULE_PREINCLUDES	= $(addprefix -I$(XPDIST)/public/, $(REQUIRES))
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef DLL
-DLL		:= $(addprefix $(OBJDIR)/, $(DLL))
-LIB		:= $(addprefix $(OBJDIR)/, $(LIB))
-endif
-endif
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
-endef
-
-ALL_TRASH		= $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \
-			  $(NOSUCHFILE) $(JDK_HEADER_CFILES) $(JDK_STUB_CFILES) \
-			  $(JRI_HEADER_CFILES) $(JRI_STUB_CFILES) $(JMC_STUBS) \
-			  $(JMC_HEADERS) $(JMC_EXPORT_FILES) so_locations \
-			  _gen _jmc _jri _stubs \
-			  $(wildcard $(JAVA_DESTPATH)/$(PACKAGE)/*.class)
-
-ifdef JDIRS
-ALL_TRASH		+= $(addprefix $(JAVA_DESTPATH)/,$(JDIRS))
-endif
-
-ifdef NSBUILDROOT
-JDK_GEN_DIR		= $(XPDIST)/_gen
-JMC_GEN_DIR		= $(XPDIST)/_jmc
-JRI_GEN_DIR		= $(XPDIST)/_jri
-JDK_STUB_DIR		= $(XPDIST)/_stubs
-else
-JDK_GEN_DIR		= _gen
-JMC_GEN_DIR		= _jmc
-JRI_GEN_DIR		= _jri
-JDK_STUB_DIR		= _stubs
-endif
-
-#
-# If this is an "official" build, try to build everything.
-# I.e., don't exit on errors.
-#
-ifdef BUILD_OFFICIAL
-EXIT_ON_ERROR		= +e
-CLICK_STOPWATCH		= date
-else
-EXIT_ON_ERROR		= -e
-CLICK_STOPWATCH		= true
-endif
-
-
-################################################################################
-
-ifdef ALL_PLATFORMS
-all_platforms:: $(NFSPWD)
-	@d=`$(NFSPWD)`;                                                       \
-	if test ! -d LOGS; then rm -rf LOGS; mkdir LOGS; fi;                  \
-	for h in $(PLATFORM_HOSTS); do                                        \
-		echo "On $$h: $(MAKE) $(ALL_PLATFORMS) >& LOGS/$$h.log";      \
-		rsh $$h -n "(chdir $$d;                                       \
-			     $(MAKE) $(ALL_PLATFORMS) >& LOGS/$$h.log;        \
-			     echo DONE) &" 2>&1 > LOGS/$$h.pid &              \
-		sleep 1;                                                      \
-	done
-
-$(NFSPWD):
-	cd $(@D); $(MAKE) $(@F)
-endif
-
-ifdef REQUIRES
-ifndef NO_NSPR
-INCLUDES += -I$(XPDIST)/$(OBJDIR)/include/nspr20/pr $(addprefix -I$(XPDIST)/public/, $(REQUIRES))
-else
-INCLUDES += $(addprefix -I$(XPDIST)/public/, $(REQUIRES))
-endif
-endif
-
-all:: $(TARGETS)
-	+$(LOOP_OVER_DIRS)
-
-libs:: $(LIBRARY) $(SHARED_LIBRARY)
-
-$(PROGRAM): $(OBJS)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),WINNT)
-	$(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
-else
-	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
-endif
-
-$(LIBRARY): $(OBJS)
-	@$(MAKE_OBJDIR)
-	rm -f $@
-	$(AR) $(OBJS)
-	$(RANLIB) $@
-
-$(SHARED_LIBRARY): $(OBJS)
-	@$(MAKE_OBJDIR)
-	rm -f $@
-	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_SHLIBS)
-	chmod +x $@
-
-ifeq ($(OS_ARCH),WINNT)
-$(DLL): $(OBJS) $(EXTRA_LIBS)
-	@$(MAKE_OBJDIR)
-	rm -f $@
-	$(LINK_DLL) $(OBJS) $(OS_LIBS) $(EXTRA_LIBS)
-endif
-
-.SUFFIXES: .i .pl .class .java .html
-
-.PRECIOUS: .java
-
-$(OBJDIR)/%: %.c
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) $*.c
-else
-	$(CC) -o $@ $(CFLAGS) $*.c $(LDFLAGS)
-endif
-
-$(OBJDIR)/%.o: %.c
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) $*.c
-else
-	$(CC) -o $@ -c $(CFLAGS) $*.c
-endif
-
-$(OBJDIR)/%.o: %.s
-	@$(MAKE_OBJDIR)
-	$(AS) -o $@ $(ASFLAGS) -c $*.s
-
-$(OBJDIR)/%.o: %.S
-	@$(MAKE_OBJDIR)
-	$(AS) -o $@ $(ASFLAGS) -c $*.S
-
-$(OBJDIR)/%: %.cpp
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(CFLAGS) $*.c $(LDFLAGS)
-
-#
-# Please keep the next two rules in sync.
-#
-$(OBJDIR)/%.o: %.cc
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ -c $(CFLAGS) $*.cc
-
-$(OBJDIR)/%.o: %.cpp
-	@$(MAKE_OBJDIR)
-ifdef STRICT_CPLUSPLUS_SUFFIX
-	echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > $(OBJDIR)/t_$*.cc
-	$(CCC) -o $@ -c $(CFLAGS) $(OBJDIR)/t_$*.cc
-	rm -f $(OBJDIR)/t_$*.cc
-else
-ifeq ($(OS_ARCH),WINNT)
-	$(CCC) -Fo$@ -c $(CFLAGS) $*.cpp
-else
-	$(CCC) -o $@ -c $(CFLAGS) $*.cpp
-endif
-endif #STRICT_CPLUSPLUS_SUFFIX
-
-%.i: %.cpp
-	$(CCC) -C -E $(CFLAGS) $< > $*.i
-
-%.i: %.c
-	$(CC) -C -E $(CFLAGS) $< > $*.i
-
-%: %.pl
-	rm -f $@; cp $*.pl $@; chmod +x $@
-
-%: %.sh
-	rm -f $@; cp $*.sh $@; chmod +x $@
-
-#
-# If this is an "official" build, try to build everything.
-# I.e., don't exit on errors.
-#
-ifdef BUILD_OFFICIAL
-EXIT_ON_ERROR	= +e
-else
-EXIT_ON_ERROR	= -e
-endif
-
-ifdef DIRS
-ifneq ($(OS_ARCH),WINNT)
-override MAKEFLAGS :=
-endif
-LOOP_OVER_DIRS =						\
-	@for d in $(DIRS); do					\
-		if test -d $$d; then				\
-			set $(EXIT_ON_ERROR);			\
-			echo "cd $$d; $(MAKE) $(MAKEFLAGS) $@";		\
-			cd $$d; $(MAKE) $(MAKEFLAGS) $@; cd ..;		\
-			set +e;					\
-		else						\
-			echo "Skipping non-directory $$d...";	\
-		fi;						\
-		$(CLICK_STOPWATCH);				\
-done
-
-$(DIRS)::
-	@if test -d $@; then				\
-		set $(EXIT_ON_ERROR);			\
-		echo "cd $@; $(MAKE) $(MAKEFLAGS)";			\
-		cd $@; $(MAKE) $(MAKEFLAGS);				\
-		set +e;					\
-	else						\
-		echo "Skipping non-directory $@...";	\
-	fi						\
-        $(CLICK_STOPWATCH);
-endif # DIRS
-
-clean::
-	rm -f $(OBJS) $(NOSUCHFILE)
-	+$(LOOP_OVER_DIRS)
-
-clobber::
-	rm -f $(OBJS) $(TARGETS) $(GARBAGE) $(NOSUCHFILE)
-	+$(LOOP_OVER_DIRS)
-
-realclean clobber_all::
-	rm -rf LOGS TAGS $(wildcard *.OBJ) $(OBJS) $(TARGETS) $(GARBAGE) $(NOSUCHFILE)
-	+$(LOOP_OVER_DIRS)
-
-alltags:
-	rm -f TAGS
-	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs etags -a
-
-export::
-	+$(LOOP_OVER_DIRS)
-
-libs::
-	+$(LOOP_OVER_DIRS)
-
-install::
-	+$(LOOP_OVER_DIRS)
-
-mac::
-	+$(LOOP_OVER_DIRS)
-
-################################################################################
-### Bunch of things that extend the 'export' rule (in order):
-################################################################################
-### JSRCS -- for compiling java files
-
-ifndef PACKAGE
-PACKAGE = .
-endif
-$(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE) $(JMCSRCDIR)::
-	@if test ! -d $@; then	    \
-		echo Creating $@;   \
-		rm -rf $@;	    \
-		$(NSINSTALL) -D $@; \
-	fi
-
-ifneq ($(JSRCS),)
-export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
-	@list=`perl $(DEPTH)/config/outofdate.pl $(PERLARG)	\
-		    -d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS)`;	\
-	if test "$$list"x != "x"; then				\
-	    echo $(JAVAC) $$list;				\
-	    $(JAVAC) $$list;					\
-	fi
-
-all:: export
-
-clobber::
-	rm -f $(XPDIST)/classes/$(PACKAGE)/*.class
-
-endif
-
-################################################################################
-## JDIRS -- like JSRCS, except you can give a list of directories and it will
-## compile all the out-of-date java files recursively below those directories.
-
-ifdef JDIRS
-
-export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
-	@for d in $(JDIRS); do							      \
-		if test -d $$d; then						      \
-			set $(EXIT_ON_ERROR);					      \
-			files=`echo $$d/*.java`;			      \
-			list=`perl $(DEPTH)/config/outofdate.pl $(PERLARG)	      \
-				    -d $(JAVA_DESTPATH)/$(PACKAGE) $$files`;	      \
-			if test "$${list}x" != "x"; then			      \
-			    echo Building all java files in $$d;		      \
-			    echo $(JAVAC) $$list;		      \
-			    $(JAVAC) $$list;		      \
-			fi;							      \
-			set +e;							      \
-		else								      \
-			echo "Skipping non-directory $$d...";			      \
-		fi;								      \
-		$(CLICK_STOPWATCH);						\
-	done
-
-all:: export
-
-clobber::
-	@for d in $(JDIRS); do			   \
-		echo rm -rf $(XPDIST)/classes/$$d; \
-		rm -rf $(XPDIST)/classes/$$d;	   \
-	done
-
-endif
-
-################################################################################
-### JDK_GEN -- for generating "old style" native methods 
-
-# Generate JDK Headers and Stubs into the '_gen' and '_stubs' directory
-
-ifneq ($(JDK_GEN),)
-
-ifdef NSBUILDROOT
-JDK_GEN_DIR	= $(XPDIST)/_gen
-JDK_STUB_DIR	= $(XPDIST)/_stubs
-else
-JDK_GEN_DIR	= _gen
-JDK_STUB_DIR	= _stubs
-endif
-
-INCLUDES += -I$(JDK_GEN_DIR)
-
-JDK_PACKAGE_CLASSES = $(JDK_GEN)
-JDK_PATH_CLASSES = $(subst .,/,$(JDK_PACKAGE_CLASSES))
-JDK_PATH_CLASSES = $(subst .,/,$(JDK_PACKAGE_CLASSES))
-JDK_HEADER_CLASSFILES	= $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JDK_PATH_CLASSES))
-JDK_STUB_CLASSFILES	= $(patsubst %,$(JAVA_DESTPATH)/%.class,$(JDK_PATH_CLASSES))
-JDK_HEADER_CFILES	= $(patsubst %,$(JDK_GEN_DIR)/%.h,$(JDK_GEN))
-JDK_STUB_CFILES		= $(patsubst %,$(JDK_STUB_DIR)/%.c,$(JDK_GEN))
-
-$(JDK_HEADER_CFILES): $(JDK_HEADER_CLASSFILES)
-$(JDK_STUB_CFILES): $(JDK_STUB_CLASSFILES)
-
-export::
-	@echo Generating/Updating JDK headers 
-	$(JAVAH) -d $(JDK_GEN_DIR) $(JDK_PACKAGE_CLASSES)
-	@echo Generating/Updating JDK stubs
-	$(JAVAH) -stubs -d $(JDK_STUB_DIR) $(JDK_PACKAGE_CLASSES)
-
-mac::
-	@echo Generating/Updating JDK headers for the Mac
-	$(JAVAH) -mac -d $(DEPTH)/lib/mac/Java/_gen $(JDK_PACKAGE_CLASSES)
-	@echo Generating/Updating JDK stubs for the Mac
-	$(JAVAH) -mac -stubs -d $(DEPTH)/lib/mac/Java/_stubs $(JDK_PACKAGE_CLASSES)
-
-# Don't delete them if the don't compile (makes it hard to debug):
-.PRECIOUS: $(JDK_HEADERS) $(JDK_STUBS)
-
-clobber::
-	rm -rf $(JDK_HEADER_CFILES) $(JDK_STUB_CFILES)
-
-endif
-
-################################################################################
-### JRI_GEN -- for generating JRI native methods
-
-# Generate JRI Headers and Stubs into the 'jri' directory
-
-ifneq ($(JRI_GEN),)
-
-ifdef NSBUILDROOT
-JRI_GEN_DIR	= $(XPDIST)/_jri
-else
-JRI_GEN_DIR	= _jri
-endif
-
-INCLUDES += -I$(JRI_GEN_DIR)
-
-JRI_PACKAGE_CLASSES = $(JRI_GEN)
-JRI_PATH_CLASSES = $(subst .,/,$(JRI_PACKAGE_CLASSES))
-
-## dependency fu
-JRI_HEADER_CLASSFILES = $(patsubst %,$(XPDIST)/classes/%.class,$(JRI_PATH_CLASSES))
-JRI_HEADER_CFILES = $(patsubst %,$(JRI_GEN_DIR)/%.h,$(JRI_GEN))
-$(JRI_HEADER_CFILES): $(JRI_HEADER_CLASSFILES)
-
-## dependency fu
-JRI_STUB_CLASSFILES = $(patsubst %,$(XPDIST)/classes/%.class,$(JRI_PATH_CLASSES))
-JRI_STUB_CFILES = $(patsubst %,$(JRI_GEN_DIR)/%.c,$(JRI_GEN))
-$(JRI_STUB_CFILES): $(JRI_STUB_CLASSFILES)
-
-export::
-	@echo Generating/Updating JRI headers 
-	$(JAVAH) -jri -d $(JRI_GEN_DIR) $(JRI_PACKAGE_CLASSES)
-	@echo Generating/Updating JRI stubs
-	$(JAVAH) -jri -stubs -d $(JRI_GEN_DIR) $(JRI_PACKAGE_CLASSES)
-	@if test ! -d $(DEPTH)/lib/mac/Java/; then						\
-		echo "!!! You need to have a ns/lib/mac/Java directory checked out.";		\
-		echo "!!! This allows us to automatically update generated files for the mac.";	\
-		echo "!!! If you see any modified files there, please check them in.";		\
-	fi
-	@echo Generating/Updating JRI headers for the Mac
-	$(JAVAH) -jri -mac -d $(DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES)
-	@echo Generating/Updating JRI stubs for the Mac
-	$(JAVAH) -jri -mac -stubs -d $(DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES)
-
-# Don't delete them if the don't compile (makes it hard to debug):
-.PRECIOUS: $(JRI_HEADERS) $(JRI_STUBS)
-
-clobber::
-	rm -rf $(JRI_HEADER_CFILES) $(JRI_STUB_CFILES)
-
-endif
-
-################################################################################
-## JMC_EXPORT -- for declaring which java classes are to be exported for jmc
-
-ifneq ($(JMC_EXPORT),)
-
-JMC_EXPORT_PATHS = $(subst .,/,$(JMC_EXPORT))
-JMC_EXPORT_FILES = $(patsubst %,$(XPDIST)/classes/$(PACKAGE)/%.class,$(JMC_EXPORT_PATHS))
-
-# We're doing NSINSTALL -t here (copy mode) because calling INSTALL will pick up 
-# your NSDISTMODE and make links relative to the current directory. This is a
-# problem because the source isn't in the current directory:
-
-export:: $(JMC_EXPORT_FILES) $(JMCSRCDIR)
-	$(NSINSTALL) -t -m 444 $(JMC_EXPORT_FILES) $(JMCSRCDIR)
-
-clobber::
-	rm -rf $(JMC_EXPORT_FILES)
-
-endif
-
-
-################################################################################
-## EXPORTS
-#
-# Copy each element of EXPORTS to $(XPDIST)/public/$(MODULE)/
-#
-
-ifneq ($(EXPORTS),)
-
-$(XPDIST)/public/$(MODULE)::
-	@if test ! -d $@; then	    \
-		echo Creating $@;   \
-		rm -rf $@;	    \
-		mkdir -p $@;	    \
-	fi
-
-export:: $(EXPORTS) $(XPDIST)/public/$(MODULE)
-	$(NSINSTALL) -t -m 444 $(EXPORTS) $(XPDIST)/public/$(MODULE)
-
-endif
-
-################################################################################
-## JMC_GEN -- for generating java modules
-
-# Provide default export & install rules when using JMC_GEN
-ifneq ($(JMC_GEN),)
-
-ifdef NSBUILDROOT
-JMC_GEN_DIR	= $(XPDIST)/_jmc
-else
-JMC_GEN_DIR	= _jmc
-endif
-
-INCLUDES += -I$(JMC_GEN_DIR)
-
-JMC_HEADERS = $(patsubst %,$(JMC_GEN_DIR)/%.h,$(JMC_GEN))
-JMC_STUBS = $(patsubst %,$(JMC_GEN_DIR)/%.c,$(JMC_GEN))
-JMC_OBJS = $(patsubst %,$(OBJDIR)/%.o,$(JMC_GEN))
-
-$(JMC_GEN_DIR)/M%.h: $(JMCSRCDIR)/%.class
-	$(JMC) -d $(JMC_GEN_DIR) -interface $(JMC_GEN_FLAGS) $(?F:.class=)
-
-$(JMC_GEN_DIR)/M%.c: $(JMCSRCDIR)/%.class
-	$(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=)
-
-$(OBJDIR)/M%.o: $(JMC_GEN_DIR)/M%.h $(JMC_GEN_DIR)/M%.c
-	@$(MAKE_OBJDIR)
-	$(CC) -o $@ -c $(CFLAGS) $(JMC_GEN_DIR)/M$*.c
-
-export:: $(JMC_HEADERS) $(JMC_STUBS)
-
-# Don't delete them if the don't compile (makes it hard to debug):
-.PRECIOUS: $(JMC_HEADERS) $(JMC_STUBS)
-
-clobber::
-	rm -rf $(JMC_HEADERS) $(JMC_STUBS)
-
-endif
-
-################################################################################
-## LIBRARY -- default rules for for building libraries
-
-ifdef LIBRARY
-libs:: $(LIBRARY)
-	$(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib
-
-install:: $(LIBRARY)
-	$(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib
-endif
-
-ifdef SHARED_LIBRARY
-libs:: $(SHARED_LIBRARY)
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
-
-install:: $(SHARED_LIBRARY)
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
-endif
-
--include $(DEPENDENCIES)
-
-ifneq ($(OS_ARCH),WINNT)
-# Can't use sed because of its 4000-char line length limit, so resort to perl
-.DEFAULT:
-	@perl -e '                                                            \
-	    open(MD, "< $(DEPENDENCIES)");                                    \
-	    while (<MD>) {                                                    \
-		if (m@ \.*/*$< @) {                                           \
-		    $$found = 1;                                              \
-		    last;                                                     \
-		}                                                             \
-	    }                                                                 \
-	    if ($$found) {                                                    \
-		print "Removing stale dependency $< from $(DEPENDENCIES)\n";  \
-		seek(MD, 0, 0);                                               \
-		$$tmpname = "$(OBJDIR)/fix.md" . $$$$;                        \
-		open(TMD, "> " . $$tmpname);                                  \
-		while (<MD>) {                                                \
-		    s@ \.*/*$< @ @;                                           \
-		    if (!print TMD "$$_") {                                   \
-			unlink(($$tmpname));                                  \
-			exit(1);                                              \
-		    }                                                         \
-		}                                                             \
-		close(TMD);                                                   \
-		if (!rename($$tmpname, "$(DEPENDENCIES)")) {                  \
-		    unlink(($$tmpname));                                      \
-		}                                                             \
-	    } elsif ("$<" ne "$(DEPENDENCIES)") {                             \
-		print "$(MAKE): *** No rule to make target $<.  Stop.\n";     \
-		exit(1);                                                      \
-	    }'
-endif
-
-#############################################################################
-# X dependency system
-#############################################################################
-
-ifneq ($(OS_ARCH),WINNT)
-
-$(MKDEPENDENCIES)::
-	@$(MAKE_OBJDIR)
-	touch $(MKDEPENDENCIES)
-	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
-
-$(MKDEPEND)::
-	cd $(MKDEPEND_DIR); $(MAKE)
-
-ifdef OBJS
-depend:: $(MKDEPEND) $(MKDEPENDENCIES)
-else
-depend::
-endif
-	+$(LOOP_OVER_DIRS)
-
-dependclean::
-	rm -f $(MKDEPENDENCIES)
-	+$(LOOP_OVER_DIRS)
-
-#-include $(OBJDIR)/depend.mk
-
-endif
-
-#############################################################################
-
--include $(MY_RULES)
-
-$(MY_CONFIG):
-$(MY_RULES):
-
-# Generate Emacs tags in a file named TAGS if ETAGS was set in $(MY_CONFIG)
-# or in $(MY_RULES)
-ifdef ETAGS
-ifneq ($(CSRCS)$(HEADERS),)
-all:: TAGS
-TAGS:: $(CSRCS) $(HEADERS)
-	$(ETAGS) $(CSRCS) $(HEADERS)
-endif
-endif
-
-################################################################################
-# Special gmake rules.
-################################################################################
-
-#
-# Re-define the list of default suffixes, so gmake won't have to churn through
-# hundreds of built-in suffix rules for stuff we don't need.
-#
-.SUFFIXES:
-.SUFFIXES: .out .a .ln .o .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html
-
-#
-# Don't delete these files if we get killed.
-#
-.PRECIOUS: .java $(JDK_HEADERS) $(JDK_STUBS) $(JRI_HEADERS) $(JRI_STUBS) $(JMC_HEADERS) $(JMC_STUBS)
-
-#
-# Fake targets.  Always run these rules, even if a file/directory with that
-# name already exists.
-#
-.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs realclean $(OBJDIR) $(DIRS)
diff --git a/config/webint.mk b/config/webint.mk
deleted file mode 100644
index a5c2928c..00000000
--- a/config/webint.mk
+++ /dev/null
@@ -1,56 +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
-#
-ifdef WEBSERVER_LANGS
-LANG_LOOP=							\
-  @for d in $(WEBSERVER_LANGS); do				\
-    if test ! -d $$d; then					\
-      echo Directory $$d does not exist. Creating...;		\
-      mkdir -p $$d;						\
-    fi;								\
-    echo cd $$d;						\
-    cd $$d;							\
-    echo $(MAKE) -f ../Makefile $(MAKEFLAGS) INT_SUBDIR=1;	\
-    $(MAKE) -f ../Makefile $(MAKEFLAGS) INT_SUBDIR=1;		\
-    cd ..;							\
-  done
-else
-LANG_LOOP= @echo "No foreign languages in this build"
-endif
-
diff --git a/httpd/src/unixso.mk b/httpd/src/unixso.mk
deleted file mode 100644
index 802ba500..00000000
--- a/httpd/src/unixso.mk
+++ /dev/null
@@ -1,254 +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
-#
-
-ifneq ($(ARCH), WINNT)
-
-SRCDIR=$(BUILD_ROOT)/httpd/src
-
-AR = ar
-
-ifeq ($(ARCH), OSF1)
-DLL_LDFLAGS += -soname $(SONAME)
-EXTRA_LIBS += -Wl,-rpath,.:../../lib:../../bin/https:../../plugins/java/bin:../../wai/lib
-ADM_EXTRA = -lcxx -lpthread -lmach -lexc -lc
-AR = rm -f ________64ELEL_ ; ar
-endif
-
-ifeq ($(ARCH), IRIX)
-DLL_LDFLAGS += -soname $(SONAME)
-ifeq ($(USE_N32), 1)
- DLL_LDFLAGS += -n32 -mips3
-endif
-EXTRA_LIBS += -rpath .:../../lib:../../bin/https:../../plugins/java/bin:../wai/lib
-# IRIX likes it twice!
-SOLINK2=$(SOLINK)
-endif
-
-ifeq ($(ARCH), SOLARIS)
-ifdef NS_USE_NATIVE
-DLL_LDFLAGS += -h $(SONAME)
-EXTRA_LIBS += -R .:../../lib:../../bin/https:../../plugins/java/bin:../wai/lib
-else
-EXTRA_LIBS += -Wl,-R,.:../../lib:../../bin/https:../../plugins/java/bin:../wai/lib
-endif
-ADM_EXTRA = $(GCCLIB)
-endif
-
-ifdef USE_LD_RUN_PATH
-EXTRA_LIBS += -L.
-export LD_RUN_PATH=./.:../../lib:../../bin/https:../../plugins/java/bin:../wai/lib
-endif
-
-ifeq ($(ARCH), SONY)
-DLL_LDFLAGS += -soname $(SONAME)
-EXTRA_LIBS += -rpath .
-endif
-
-ifeq ($(ARCH), NEC)
-DLL_LDFLAGS += -h $(SONAME)
-endif
-
-ifeq ($(ARCH), HPUX)
-DLL_LDFLAGS += -L. 
-SOLINK=-L. -l$(HTTPDSO_NAME)$(DLL_PRESUF)
-EXTRA_LIBS += -Wl,+b.:../../lib:../../bin/https:../../plugins/java/bin:../wai/lib
-# The line below is required for LiveWire DB2 to work.
-EXTRA_LIBS += -Wl,-uallow_unaligned_data_access -lhppa
-LD=$(CCC) 
-# Well HPUX's not happy about including libnspr.sl(-lnspr) into our executable,
-# it's that ___ +eh again.  
-NSPRLINK=$(NOTHING)
-#LDAPLINK=-L. $(addsuffix .a, $(addprefix lib, $(LDAP_DOTALIB_NAMES))) \
-#	 $(addprefix -l, $(LDAP_SOLIB_NAMES))
-endif
-
-ifeq ($(ARCH), AIX)
-MKSHLIB_FLAGS += -berok -brtl
-SOLINK=-L. -L../../lib -lns-dshttpd$(DLL_PRESUF)
-#LDAPLINK=-L. $(addsuffix .a, $(addprefix lib, $(LDAP_DOTALIB_NAMES))) \
-#	 $(addprefix -l, $(LDAP_SOLIB_NAMES))
-#NSPRLINK = -L. -lnspr$(DLL_PRESUF)
-#NSPRLINK = -L. -ldsnspr$(DLL_PRESUF)
-ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS) 
-DEF_LIBPATH := .:../../lib:$(DEF_LIBPATH)
-endif
-
-ifeq ($(ARCH), SUNOS4)
-EXTRA_LIBS += -L.
-ADM_EXTRA = $(EXTRA_LIBS)
-endif
-
-ifeq ($(ARCH), UnixWare)
-DLL_LDFLAGS += -h $(SONAME)
-NSPRLINK = -L. -ldsnspr$(DLL_PRESUF)
-endif
-
-EXTRA_LIBS += $(MATHLIB)
-
-ifndef SONAME
-SONAME=$(HTTPDSO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX)
-endif
-
-ifndef SOLINK
-SOLINK=./$(HTTPDSO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX)
-endif
-
-#ifndef LDAPLINK
-#LDAPLINK=$(LDAPOBJNAME)
-#endif
-
-ifndef NSPRLINK
-NSPRLINK=libnspr$(DLL_PRESUF).$(DLL_SUFFIX)
-endif
-
-# Temporary directory for the libraries and their object files
-$(OBJDIR)/httpd-lib:
-ifeq ($(ARCH), HPUX)
-	mkdir -p $(OBJDIR)/httpd-lib/nspr20
-endif
-	mkdir -p $(OBJDIR)/httpd-lib/sslio
-	mkdir -p $(OBJDIR)/httpd-lib/arlib
-	mkdir -p $(OBJDIR)/httpd-lib/libsec
-	mkdir -p $(OBJDIR)/httpd-lib/libdbm
-	mkdir -p $(OBJDIR)/httpd-lib/xp
-
-# Define a LIBSEC which doesn't include libdbm and xp.
-LIBSECNAME=$(MCOM_LIBDIR)/libsec/$(NSOBJDIR_NAME)/libsec-$(WHICHA).$(LIB_SUFFIX)
-ifndef LIBSECOBJS
-LIBSEC1=$(LIBSECNAME)
-else
-LIBSEC1=$(LIBSECOBJS)
-endif
-
-DEPLIBS = $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP)
-
-DEPLINK = $(OBJDIR)/lib/libsi18n.a
-DEPLINK +=	$(OBJDIR)/lib/libmsgdisp.a
-DEPLINK +=	$(SOLINK) $(LDAPLINK) $(NSPRLINK) $(SOLINK2)
-
-# Relative to the directory that contains the .so
-BUILTDIR = .
-
-ifndef NO_VERITY
-
-ifeq ($(DO_SEARCH), yes)
-ifdef VERITY_TASKSTUB
-TASKSTUB = ./taskstub.o
-else
-TASKSTUB =
-endif
-
-ifndef VERITY_SOLINK
-VERITY_SOLINK=$(TASKSTUB) -L. $(addprefix -l, $(VERITY_LIBNAMES))
-endif
-
-VERITYDEP=$(addprefix $(OBJDIR)/, $(VERITYOBJNAMES) $(TASKSTUB))
-
-$(VERITYDEP) : $(LIBVERITY)
-	cp $(LIBVERITY) $(VERITY_TASKSTUB) $(OBJDIR)
-
-DEPLINK += $(VERITY_SOLINK)
-DEPLIBS += $(VERITYDEP)
-endif
-
-endif
-
-SERVLIBS = $(addprefix $(OBJDIR)/lib/, libadmin.a libaccess.a \
-		libldapu.a libbase.a libsi18n.a)
-SERVLIB_DIRS = $(addprefix $(OBJDIR)/lib/, libadmin libaccess base \
-                           ldaputil libmsgdisp libsi18n)
-SERVLIB_OBJS = $(subst $(OBJDIR)/,$(BUILTDIR)/, \
-                               $(wildcard $(addsuffix /*.o, $(SERVLIB_DIRS))))
-
-# Removed for ns-security integration
-#NSLIBS = $(SECLIB) $(LIBSSLIO)
-
-ADMLIB_LIBS = $(SERVLIBS) $(NSLIBS)
-
-
-admobjs:
-ifeq ($(ARCH), HPUX)
-	cd $(OBJDIR)/httpd-lib/nspr20; $(AR) x $(LIBNSPR)
-endif
-	cd $(OBJDIR)/httpd-lib/sslio; $(AR) x $(LIBSSLIO)
-	cd $(OBJDIR)/httpd-lib/libdbm; $(AR) x $(LIBDBM)
-	cd $(OBJDIR)/httpd-lib/xp; $(AR) x $(LIBXP)
-	cd $(OBJDIR)/httpd-lib/libdbm; $(AR) x $(LIBDBM)
-	cd $(OBJDIR)/httpd-lib/xp; $(AR) x $(LIBXP)
-	rm -f $(addprefix $(OBJDIR)/httpd-lib/xp/, xp_time.o xplocale.o \
-                                                   xp_cntxt.o)
-
-#$(LDAPOBJNAME):	ldapobjs
-
-#ldapobjs:
-#	(cd $(OBJDIR); rm -f $(LDAPOBJNAME))
-#	cp $(LIBLDAP) $(OBJDIR)
-
-# Removed for ns-security integration.
-#OBJRULES += ldapobjs
-
-# Removed the httpd-lib from link for ns-security integration.
-#ADMOBJS=$(SERVLIB_OBJS) $(BUILTDIR)/httpd-lib/*/*.o
-#OBJRULES += admobjs
-ADMLIB=$(OBJDIR)/$(SONAME)
-
-$(ADMLIB): $(ADMLIB_LIBS)
-ifeq ($(ARCH), IRIX)
-    ifeq ($(USE_N32), 1)	# no -objectlist any more
-	cd $(OBJDIR) ; \
-	$(LINK_DLL) \
-             $(SERVLIB_OBJS) $(ADM_EXTRA)
-    else
-	echo "$(SERVLIB_OBJS)" > /tmp/objectlist
-	tr ' ' '\012' < /tmp/objectlist > /tmp/objectlist.NEW
-	mv /tmp/objectlist.NEW /tmp/objectlist
-	cd $(OBJDIR) ; \
-	$(LINK_DLL) \
-	     -objectlist /tmp/objectlist $(ADM_EXTRA)
-	rm /tmp/objectlist
-    endif
-else
-	cd $(OBJDIR) ; \
-	$(LINK_DLL) \
-             $(SERVLIB_OBJS) $(ADM_EXTRA)
-endif
-
-
-endif
diff --git a/internal_buildpaths.mk b/internal_buildpaths.mk
deleted file mode 100644
index 30c292ec..00000000
--- a/internal_buildpaths.mk
+++ /dev/null
@@ -1,153 +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
-#
-# This file is where you tell the build process where to find the
-# various components used during the build process.
-
-# You can either use components built locally from source or
-# pre-built components.  The reason for the different macros
-# for SOURCE and BUILD is that the locations for the libs, includes,
-# etc. are usually different for packages built from source vs.
-# pre-built packages.  As an example, when building NSPR from
-# source, the includes are in mozilla/dist/$(OBJDIR_NAME)/include
-# where OBJDIR_NAME includes the OS, arch, compiler, thread model, etc.
-# When using the pre-built NSPR from Mozilla FTP, the include files
-# are just in nsprdir/include.  This is why we have to make the
-# distinction between a SOURCE component and a BUILD (pre-built)
-# component.  See components.mk for the gory details.
-
-# For each component, specify the source root OR the pre-built
-# component directory.  If both a SOURCE_ROOT and a BUILD_DIR are
-# defined for a component, the SOURCE_ROOT will be used - don't do
-# this, it's confusing.
-
-# For the Mozilla components, if using source for all of them,
-# you can just define MOZILLA_SOURCE_ROOT - the build will
-# assume all of them have been built in that same directory
-# (as per the recommended build instructions)
-
-# For all components, the recommended way is to put each
-# component in a subdirectory of the parent directory of
-# BUILD_ROOT, both with pre-built and source components
-
-# work around vsftpd -L problem
-ifeq ($(COMPONENT_PULL_METHOD), FTP)
-ifdef USING_VSFTPD
-VSFTPD_HACK=1
-endif
-endif
-
-#MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
-
-#NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef NSPR_SOURCE_ROOT
-NSPR_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nspr
-NSPR_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL)/nspr32
-# NSPR also needs a build dir with a full, absolute path for some reason
-NSPR_ABS_BUILD_DIR = $(NSCP_ABS_DISTDIR_FULL_RTL)/nspr
-endif # NSPR_SOURCE_ROOT
-
-#DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef DBM_SOURCE_ROOT
-DBM_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/dbm
-endif # DBM_SOURCE_ROOT
-
-#SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef SECURITY_SOURCE_ROOT
-SECURITY_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nss
-SECURITY_BUILD_DIR_32 = $(NSCP_DISTDIR_FULL_RTL)/nss32
-endif # SECURITY_SOURCE_ROOT
-
-#SVRCORE_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef SVRCORE_SOURCE_ROOT
-SVRCORE_BUILD_DIR = $(NSCP_DISTDIR)/svrcore
-endif # SVRCORE_SOURCE_ROOT
-
-#LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef LDAPSDK_SOURCE_ROOT
-LDAP_ROOT = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk
-LDAP_ROOT_32 = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk32
-endif # LDAPSDK_SOURCE_ROOT
-
-#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
-ifndef SASL_SOURCE_ROOT
-SASL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/sasl
-endif # SASL_SOURCE_ROOT
-
-#NETSNMP_SOURCE_ROOT = $(BUILD_ROOT)/../net-snmp
-ifndef NETSNMP_SOURCE_ROOT
-NETSNMP_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/net-snmp
-endif # NETSNMP_SOURCE_ROOT
-
-#ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-ifndef ICU_SOURCE_ROOT
-ICU_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/libicu
-endif # ICU_SOURCE_ROOT
-
-#DB_SOURCE_ROOT = $(BUILD_ROOT)/../db-4.2.52.NC
-# DB_MAJOR_MINOR is the root name for the db shared library
-DB_MAJOR_MINOR := db-4.2
-ifndef DB_SOURCE_ROOT
-# db_component_name is the dir name in /s/b/c
-db_component_name=db42
-db_path_config :=$(NSCP_DISTDIR)/$(db_component_name)
-endif # DB_SOURCE_ROOT
-
-#ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
-ifndef ADMINUTIL_SOURCE_ROOT
-ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
-endif # ADMINUTIL_SOURCE_ROOT
-
-#SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
-ifndef SETUPUTIL_SOURCE_ROOT
-SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-endif # SETUPUTIL_SOURCE_ROOT
-
-ifndef ADMINSERVER_SOURCE_ROOT
-ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
-endif
-
-DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
-
-LDAPJDK_DIR = $(CLASS_DEST)
-
-CRIMSON_BUILD_DIR = $(CLASS_DEST)
-
-ifndef PERLDAP_SOURCE_ROOT
-PERLDAP_BUILT_DIR = $(NSCP_DISTDIR_FULL_RTL)/perldap
-endif
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
deleted file mode 100644
index 3985c0ba..00000000
--- a/internal_comp_deps.mk
+++ /dev/null
@@ -1,703 +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
-#
-# This file defines dependencies for components and 
-# tells how to satisfy thoes dependencies
-
-# For internal components, we use ftp_puller_new.pl
-# We should consider using wget or something like that
-# in the future.
-
-BUILD_MODE = ext
-
-ifdef BUILD_PUMPKIN
-PUMPKIN_AGE := 120
-#BUILD_BOMB=
-BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(BUILD_ROOT)/pumpkin.dat)
-BOMB=$(BUILD_BOMB)
-endif # BUILD_PUMPKIN
-
-ifndef NSPR_SOURCE_ROOT
-NSPR_IMPORT = $(COMPONENTS_DIR_DEV)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR)
-NSPR_DEP = $(NSPR_LIBPATH)/libnspr4.$(LIB_SUFFIX)
-
-ifndef NSPR_PULL_METHOD
-NSPR_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(NSPR_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(NSPR_PULL_METHOD) \
-		-objdir $(NSPR_BUILD_DIR) -componentdir $(NSPR_IMPORT) \
-		-files lib,include
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component NSPR file $@" ; \
-	fi
-endif # NSPR_SOURCE_ROOT
-
-ifndef SECURITY_SOURCE_ROOT
-SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR)
-ifeq ($(ARCH), WINNT)
-  SECURITY_DEP = $(SECURITY_LIBPATH)/ssl3.$(DLL_SUFFIX)
-else
-  SECURITY_DEP = $(SECURITY_LIBPATH)/libssl3.$(DLL_SUFFIX)
-endif
-
-ifdef VSFTPD_HACK
-SECURITY_FILES=lib,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS))
-else
-SECURITY_FILES=lib,include,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS))
-endif
-
-ifndef SECURITY_PULL_METHOD
-SECURITY_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SECURITY_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(RM) -rf $(SECURITY_BINPATH)
-	mkdir -p $(SECURITY_BINPATH)
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT) \
-		-files $(SECURITY_FILES)
-ifdef VSFTPD_HACK
-# work around vsftpd -L problem
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(SECURITY_BUILD_DIR) -componentdir $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE) \
-		-files include
-endif
-endif # COMPONENT_DEPS
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component NSS file $@" ; \
-	fi
-endif # SECURITY_SOURCE_ROOT
-
-ifndef SVRCORE_SOURCE_ROOT
-SVRCORE_IMPORT = $(COMPONENTS_DIR)/svrcore/$(SVRCORE_RELDATE)/$(NSOBJDIR_NAME)
-#SVRCORE_IMPORT = $(COMPONENTS_DIR_DEV)/svrcore/$(SVRCORE_RELDATE)/$(NSOBJDIR_NAME)
-ifeq ($(ARCH), WINNT)
-  SVRCORE_DEP = $(SVRCORE_LIBPATH)/svrcore.$(LIB_SUFFIX)
-else
-  SVRCORE_DEP = $(SVRCORE_LIBPATH)/libsvrcore.$(LIB_SUFFIX)
-endif
-
-ifndef SVRCORE_PULL_METHOD
-SVRCORE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SVRCORE_DEP): $(NSCP_DISTDIR)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(SVRCORE_PULL_METHOD) \
-		-objdir $(SVRCORE_BUILD_DIR) -componentdir $(SVRCORE_IMPORT)/.. \
-		-files xpheader.jar -unzip $(SVRCORE_INCDIR)
-	$(FTP_PULL) -method $(SVRCORE_PULL_METHOD) \
-		-objdir $(SVRCORE_BUILD_DIR) -componentdir $(SVRCORE_IMPORT) \
-		-files mdbinary.jar -unzip $(SVRCORE_BUILD_DIR)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component SVRCORE file $@" ; \
-	fi
-endif # SVRCORE_SOURCE_ROOT
-
-ifndef LDAPSDK_SOURCE_ROOT
-ifndef LDAP_VERSION
-  LDAP_VERSION = $(LDAP_RELDATE)
-endif
-ifndef LDAP_SBC
-LDAP_SBC = $(COMPONENTS_DIR_DEV)
-#LDAP_SBC = $(COMPONENTS_DIR)
-endif
-LDAPOBJDIR = $(FULL_RTL_OBJDIR)
-# LDAP does not have PTH version, so here is the hack which treat non PTH
-# version as PTH version
-ifeq ($(USE_PTHREADS), 1)
-  LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1)
-else
-  LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR)
-endif
-ifeq ($(ARCH), WINNT)
-  LDAPSDK_DEP = $(LDAPSDK_LIBPATH)/nsldap32v$(LDAP_SUF).$(DLL_SUFFIX)
-  LDAPSDK_PULL_LIBS = lib/nsldapssl32v$(LDAP_SUF).$(LIB_SUFFIX),lib/nsldapssl32v$(LDAP_SUF).$(LDAP_DLL_SUFFIX),lib/nsldap32v$(LDAP_SUF).$(LIB_SUFFIX),lib/nsldap32v$(LDAP_SUF).$(LDAP_DLL_SUFFIX),lib/nsldappr32v$(LDAP_SUF).$(LIB_SUFFIX),lib/nsldappr32v$(LDAP_SUF).$(LDAP_DLL_SUFFIX)
-else
-  LDAPSDK_DEP = $(LDAPSDK_LIBPATH)/libldap$(LDAP_SUF).$(DLL_SUFFIX)
-  LDAPSDK_PULL_LIBS = lib/libssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF).$(LDAP_DLL_SUFFIX),lib/libldap$(LDAP_SUF)$(LDAP_DLL_PRESUF).$(LDAP_DLL_SUFFIX),lib/libprldap$(LDAP_SUF)$(LDAP_DLL_PRESUF).$(LDAP_DLL_SUFFIX)
-endif
-
-# Solaris and HP-UX PA-RISC only #########################################
-# if building 64 bit version, also need the 32 bit version of NSS and NSPR
-ifeq ($(PACKAGE_LIB32), 1)
-  NSPR_IMPORT_32 = $(COMPONENTS_DIR_DEV)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR_32)
-  SECURITY_IMPORT_32 = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR_32)
-  LDAP_RELEASE_32 = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(FULL_RTL_OBJDIR_32)
-  SECURITY_FILES_32 = $(subst $(SPACE),$(COMMA),$(SECURITY_FILES_32_TMP))
-endif
-
-ifndef LDAPSDK_PULL_METHOD
-LDAPSDK_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(LDAPSDK_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	mkdir -p $(LDAP_LIBPATH)
-	$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
-		-objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \
-		-files include,$(LDAPSDK_PULL_LIBS),bin
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component LDAPSDK file $@" ; \
-	fi
-
-ifeq ($(PACKAGE_LIB32), 1)
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(NSPR_BUILD_DIR_32) -componentdir $(NSPR_IMPORT_32) \
-		-files lib
-	$(RM) -rf $(SECURITY_BUILD_DIR_32)/lib
-	mkdir -p $(SECURITY_BUILD_DIR_32)/lib
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(SECURITY_BUILD_DIR_32)/lib -componentdir $(SECURITY_IMPORT_32)/lib \
-		-files $(SECURITY_FILES_32)
-	$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
-		-objdir $(LDAP_ROOT_32) -componentdir $(LDAP_RELEASE_32) \
-		-files lib
-	-@if [ -f $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI_FILE) ] ; then \
-		mv -f $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI_FILE) $(SECURITY_BUILD_DIR_32)/lib/$(NSSCKBI32_FILE) ; \
-	fi
-endif # PACKAGE_LIB32
-##
-endif # LDAPSDK_SOURCE_ROOT
-
-ifndef SASL_SOURCE_ROOT
-ifneq ($(ARCH), Linux)
-SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
-SASL_DEP = $(SASL_INCLUDE)/sasl.h
-ifndef SASL_PULL_METHOD
-SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
-		-objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
-		-files include,lib
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component SASL file $@" ; \
-	fi
-endif # not Linux
-endif # SASL_SOURCE_ROOT
-
-ifndef ICU_SOURCE_ROOT
-#ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
-ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
-ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h
-ifndef ICU_PULL_METHOD
-ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(ICU_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(ICU_PULL_METHOD) \
-		-objdir $(ICU_BUILD_DIR) -componentdir $(ICU_RELEASE) \
-		-files lib,include,bin
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component ICU file $@" ; \
-	fi
-endif # ICU_SOURCE_ROOT
-
-ifndef DB_SOURCE_ROOT
-#if no version specified, we'll use the latest one
-ifndef DB_VERSION
-  DB_VERSION=20060308
-endif
-# define the paths to the component parts
-#db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
-db_components_share=$(COMPONENTS_DIR_DEV)/$(db_component_name)
-MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ
-db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(MY_NSOBJDIR_TAG)
-# add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc.
-DB_FILES=include,lib,bin
-
-ifeq ($(ARCH), WINNT)
-  DB_LIB_DEP =$(DB_STATIC_LIB)
-else	# not WINNT
-  DB_LIB_DEP =$(DB_LIBPATH)/$(DB_LIBNAME).$(DLL_SUFFIX)
-endif	# not WINNT
-
-ifndef DB_PULL_METHOD
-DB_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(DB_LIB_DEP): $(NSCP_DISTDIR)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(DB_PULL_METHOD) \
-		-objdir $(db_path_config) -componentdir $(db_release_config) \
-		-files $(DB_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component $(db_component_name) file $@" ; \
-	fi
-endif # DB_SOURCE_ROOT
-
-######## END OF OPEN SOURCE COMPONENTS ######################
-
-######## The rest of these components are internal only (for now)
-
-# ADMINUTIL library #######################################
-ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)
-ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
-ifeq ($(BUILD_MODE), int)
-#  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-  ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-else
-# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-  ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-endif
-ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
-
-#
-# Libadminutil
-#
-ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX).$(ADMINUTIL_DOT_VER)
-
-ifndef ADMINUTIL_PULL_METHOD
-ADMINUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(ADMINUTIL_DEP): ${NSCP_DISTDIR_FULL_RTL}
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(ADMINUTIL_PULL_METHOD) \
-		-objdir $(ADMINUTIL_BUILD_DIR) \
-		-componentdir $(ADMINUTIL_IMPORT) \
-		-files include,lib
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component adminutil file $@" ; \
-	fi
-
-###########################################################
-# Net-SNMP
-
-ifndef NETSNMP_SOURCE_ROOT
-ifneq ($(ARCH), Linux)
-#NETSNMP_RELEASE = $(COMPONENTS_DIR_DEV)/net-snmp/$(NETSNMP_VER)/$(NSOBJDIR_NAME)
-NETSNMP_RELEASE = $(COMPONENTS_DIR)/net-snmp/$(NETSNMP_VER)/$(NSOBJDIR_NAME)
-NETSNMP_DEP = $(NETSNMP_INCDIR)/net-snmp/net-snmp-includes.h
-ifndef NETSNMP_PULL_METHOD
-NETSNMP_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(NETSNMP_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifneq ($(ARCH), WINNT)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(NETSNMP_PULL_METHOD) \
-		-objdir $(NETSNMP_BUILD_DIR) -componentdir $(NETSNMP_RELEASE) \
-		-files lib,include,bin
-endif
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component NETSNMP file $@" ; \
-	fi
-endif # Linux
-endif # NETSNMP_SOURCE_ROOT
-
-###########################################################
-
-### SETUPUTIL #############################
-# this is where the build looks for setupsdk components
-SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR)/setuputil
-SETUPUTIL_VERSION = $(SETUPUTIL_RELDATE)
-ifeq ($(BUILD_MODE), int)
-#  SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
-  SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
-else
-  SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
-endif
-
-ifeq ($(ARCH), WINNT)
-SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil
-SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX)
-else
-SETUPUTIL_FILES = bin,lib,include
-SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
-endif
-
-ifndef SETUPUTIL_PULL_METHOD
-SETUPUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SETUPUTIL_DEP): $(NSCP_DISTDIR)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(SETUPUTIL_PULL_METHOD) \
-		-objdir $(SETUPUTIL_BUILD_DIR) -componentdir $(SETUPUTIL_RELEASE) \
-		-files $(SETUPUTIL_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component SETUPUTIL file $@" ; \
-	fi
-
-# apache-axis java classes #######################################
-AXIS_RELEASE = $(COMPONENTS_DIR)/axis
-#AXISJAR_DIR = $(AXISJAR_RELEASE)/$(AXISJAR_COMP)/$(AXISJAR_VERSION)
-AXIS_DIR = $(AXIS_RELEASE)/$(AXIS_VERSION)
-AXIS_DEP = $(AXIS_FILE) 
-AXIS_REL_DIR=$(subst -bin,,$(subst .zip,,$(AXIS)))
-
-# This is java, so there is only one real platform subdirectory
-
-#PACKAGE_UNDER_JAVA += $(AXIS_FILE)
-
-ifndef AXIS_PULL_METHOD
-AXIS_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(AXIS_DEP): $(CLASS_DEST) 
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(AXIS_DIR) \
-		-files $(AXIS_FILES) -unzip $(CLASS_DEST)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component AXIS files $@" ; \
-	fi
-
-###########################################################
-
-# other dsml java classes #######################################
-DSMLJAR_FILES = $(DSMLJAR)
-DSMLJAR_RELEASE = $(COMPONENTS_DIR)
-#DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION)
-DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars
-DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar $(CLASS_DEST)/jakarta-commons-codec.jar
-
-ifndef DSMLJAR_PULL_METHOD
-DSMLJAR_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(DSMLJAR_DEP): $(CLASS_DEST) 
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(DSMLJAR_DIR) \
-		-files $(DSMLJAR_FILES)
-
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component DSMLJAR files $@" ; \
-	fi
-
-###########################################################
-
-# XMLTOOLS java classes #######################################
-CRIMSONJAR_FILES = $(CRIMSONJAR),$(CRIMSON_LICENSE)
-CRIMSONJAR_RELEASE = $(COMPONENTS_DIR)
-CRIMSONJAR_DIR = $(CRIMSONJAR_RELEASE)/$(CRIMSONJAR_COMP)/$(CRIMSONJAR_VERSION)
-CRIMSONJAR_DEP = $(CRIMSONJAR_FILE) $(CLASS_DEST)/$(CRIMSON_LICENSE)
-
-# This is java, so there is only one real platform subdirectory
-
-PACKAGE_UNDER_JAVA += $(CRIMSONJAR_FILE)
-
-ifndef CRIMSONJAR_PULL_METHOD
-CRIMSONJAR_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(CRIMSONJAR_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(CRIMSONJAR_DIR) \
-		-files $(CRIMSONJAR_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component CRIMSONJAR files $@" ; \
-	fi
-
-###########################################################
-
-# ANT java classes #######################################
-ifeq ($(BUILD_JAVA_CODE),1)
-ifndef GET_ANT_FROM_PATH
-#  (we use ant for building some Java code)
-ANTJAR = ant.jar ant-launcher.jar
-#JAXPJAR = jaxp.jar # ???
-ANT_FILES = $(ANTJAR) $(JAXPJAR)
-ANT_RELEASE = $(COMPONENTS_DIR)
-ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
-ANT_DIR = $(ANT_HOME)/lib
-ANT_DEP = $(addprefix $(CLASS_DEST)/, $(ANT_FILES))
-ANT_CP = $(subst $(SPACE),$(PATH_SEP),$(ANT_DEP))
-ANT_PULL = $(subst $(SPACE),$(COMMA),$(ANT_FILES))
-
-ifndef ANT_PULL_METHOD
-ANT_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(ANT_DEP): $(CLASS_DEST) $(CRIMSONJAR_DEP)
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(ANT_DIR) \
-		-files $(ANT_PULL)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component ant files $@" ; \
-	fi
-endif
-endif # GET_ANT_FROM_PATH
-###########################################################
-
-# LDAP java classes #######################################
-LDAPJDK_VERSION = $(LDAPJDK_RELDATE)
-LDAPJDK_RELEASE = $(COMPONENTS_DIR)
-LDAPJDK_IMPORT = $(LDAPJDK_RELEASE)/$(LDAPJDK_COMP)/$(LDAPJDK_VERSION)/$(NSOBJDIR_NAME)
-# This is java, so there is only one real platform subdirectory
-LDAPJDK_DEP=$(LDAPJARFILE)
-
-#PACKAGE_UNDER_JAVA += $(LDAPJARFILE)
-
-ifndef LDAPJDK_PULL_METHOD
-LDAPJDK_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(LDAPJDK_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(LDAPJDK_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(LDAPJDK_IMPORT) \
-		-files $(LDAPJDK)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component LDAPJDK file $@" ; \
-	fi
-
-###########################################################
-# LDAP Console java classes
-###########################################################
-
-ifeq ($(BUILD_MODE), int)
-#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
-LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
-else
-LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR)
-endif
-LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/$(NSOBJDIR_NAME)
-LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
-LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
-
-ifndef LDAPCONSOLE_PULL_METHOD
-LDAPCONSOLE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(LDAPCONSOLE_DEP): $(LDAPCONSOLE_DIR)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(LDAPCONSOLE_PULL_METHOD) \
-		-objdir $(LDAPCONSOLE_DIR) -componentdir $(LDAPCONSOLE_JARDIR) \
-		-files $(LDAPCONSOLE_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component LDAPCONSOLE file $@" ; \
-	fi
-
-###########################################################
-### Perldap package #######################################
-
-PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME)
-PERLDAP_FILES=lib
-PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib/perl
-PACKAGE_SRC_DEST += $(PERLDAP_DEP) usr/lib
-
-# this is the rule to pull PerLDAP
-ifndef PERLDAP_PULL_METHOD
-PERLDAP_PULL_METHOD = FTP
-endif
-
-$(PERLDAP_DEP):
-ifdef INTERNAL_BUILD
-	$(RM) -rf $@
-	$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
-		-objdir $(PERLDAP_BUILT_DIR) \
-		-componentdir $(PERLDAP_COMPONENT_DIR) \
-		-files $(PERLDAP_FILES)
-	@if [ ! -d $@ ] ; \
-	then echo "Error: could not get component PERLDAP file $@" ; \
-	exit 1 ; \
-	fi
-endif
-
-###########################################################
-### Admin Server package ##################################
-ifeq ($(USE_ADMINSERVER), 1)
-ADMIN_REL = $(ADM_VERSDIR)
-ADMIN_REL_DATE = $(ADM_VERSION)
-ADMIN_FILE := $(ADMINSERVER_PKG)
-#ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
-ifeq ($(BUILD_MODE), int)
-IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-else
-IMPORTADMINSRV_BASE=$(FED_COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-endif
-IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME)
-ADMSERV_DEP = $(ADMSERV_DIR)/$(ADMINSERVER_PKG)
-
-ADM_VERSION = $(ADM_RELDATE)
-
-ifndef ADMSERV_PULL_METHOD
-ADMSERV_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-ifndef ADMSERV_DEPS
-ADMSERV_DEPS = $(COMPONENT_DEPS)
-endif
-
-$(ADMSERV_DEP): $(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)
-ifdef ADMSERV_DEPS
-	$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
-		-objdir $(ADMSERV_DIR) -componentdir $(IMPORTADMINSRV) \
-		-files $(ADMIN_FILE)
-endif
-	@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component ADMINSERV file $@" ; \
-	exit 1 ; \
-	fi
-endif # USE_ADMINSERVER
-### Admin Server END ######################################
-
-### DOCS #################################
-# only pull docs with admin server
-ifeq ($(USE_ADMINSERVER), 1)
-# this is where the build looks for slapd docs
-DSDOC_VERSDIR = $(DIR_NORM_VERSION)
-ifeq ($(BUILD_MODE), int)
-#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
-DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
-else
-DSDOC_RELEASE = $(FED_COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
-endif
-
-DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS)
-DSDOC_DEP := $(DSDOC_DIR)/$(DSDOC_COPYRIGHT)
-
-ifndef DSDOC_PULL_METHOD
-DSDOC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(DSDOC_DEP): $(NSCP_DISTDIR)
-	$(FTP_PULL) -method $(DSDOC_PULL_METHOD) \
-		-objdir $(DSDOC_DIR) -componentdir $(DSDOC_RELEASE) \
-		-files $(DSDOC_FILES)
-	@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component DSDOC file $@" ; \
-	exit 1 ; \
-	fi
-endif # USE_ADMINSERVER
-### DOCS END #############################
-
-# Windows sync component for Active Directory
-ADSYNC = PassSync.msi
-ADSYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync
-ADSYNC_FILE = $(ADSYNC_DEST)/$(ADSYNC)
-ADSYNC_FILES = $(ADSYNC)
-ADSYNC_RELEASE = $(COMPONENTS_DIR)/winsync/passsync
-# windows make naming convention - release = optimize, debug = full
-ifeq ($(BUILD_DEBUG), optimize)
-	ADSYNC_DIR_SUFFIX=release
-else
-	ADSYNC_DIR_SUFFIX=debug
-endif
-ADSYNC_DIR = $(ADSYNC_RELEASE)/$(ADSYNC_VERSION)/$(ADSYNC_DIR_SUFFIX)
-
-ADSYNC_DEP = $(ADSYNC_FILE)
-PACKAGE_SRC_DEST += $(ADSYNC_FILE) winsync
-
-ifndef ADSYNC_PULL_METHOD
-ADSYNC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(ADSYNC_DEP): $(NSCP_DISTDIR_FULL_RTL) 
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(ADSYNC_DEST) -componentdir $(ADSYNC_DIR) \
-		-files $(ADSYNC_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component ADSYNC files $@" ; \
-	fi
-# Windows sync component for Active Directory
-
-# Windows sync component for NT4
-NT4SYNC = ntds.msi
-NT4SYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync
-NT4SYNC_FILE = $(NT4SYNC_DEST)/$(NT4SYNC)
-NT4SYNC_FILES = $(NT4SYNC)
-NT4SYNC_RELEASE = $(COMPONENTS_DIR)/winsync/ntds
-# windows make naming convention - release = optimize, debug = full
-ifeq ($(BUILD_DEBUG), optimize)
-	NT4SYNC_DIR_SUFFIX=release
-else
-	NT4SYNC_DIR_SUFFIX=debug
-endif
-NT4SYNC_DIR = $(NT4SYNC_RELEASE)/$(NT4SYNC_VERSION)/$(NT4SYNC_DIR_SUFFIX)
-
-NT4SYNC_DEP = $(NT4SYNC_FILE)
-PACKAGE_SRC_DEST += $(NT4SYNC_FILE) winsync
-
-ifndef NT4SYNC_PULL_METHOD
-NT4SYNC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(NT4SYNC_DEP): $(NSCP_DISTDIR_FULL_RTL) 
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(NT4SYNC_DEST) -componentdir $(NT4SYNC_DIR) \
-		-files $(NT4SYNC_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component NT4SYNC files $@" ; \
-	fi
-# Windows sync component for NT4
-
-# BUILD_BOMB stuff
-PUMPKIN_TARGET = pumpkin
-$(PUMPKIN_TARGET):
-ifdef BUILD_PUMPKIN
-	@echo NSOS_RELEASE is: $(NSOS_RELEASE)
-	$(PERL) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat
-endif # BUILD_PUMPKIN
diff --git a/ldap/Makefile b/ldap/Makefile
deleted file mode 100644
index fa1756b3..00000000
--- a/ldap/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
-#
-
-# GNU Makefile for Directory Server and Ldap SDK
-#
-
-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)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-all: $(LDAP_LIBDIR) $(LDAP_BINDIR) $(LDAP_OBJDIR) ldapprogs ldapdocs
-
-ldapprogs:
-	cd include; $(MAKE) $(MFLAGS) all
-	cd libraries; $(MAKE) $(MFLAGS) buildDirectory
-	cd servers; $(MAKE) $(MFLAGS) all
-ifneq ($(ARCH), WINNT) 
-	cd systools; $(MAKE) $(MFLAGS) all
-	# new unix installer
-ifeq ($(USE_SETUPUTIL), 1)
-	cd cm/newinst; $(MAKE) $(MFLAGS)  all
-endif # USE_SETUPUTIL
-else # not WINNT
-ifeq ($(USE_SETUPUTIL), 1)
-	cd cm/newinstnt; $(MAKE) $(MFLAGS) all
-endif # USE_SETUPUTIL
-endif # WINNT
-	cd admin; $(MAKE) $(MFLAGS) all
-ifeq ($(ARCH), WINNT) 
-	cd synctools; $(MAKE) all
-endif
-
-ldapdocs:
-	if [ -d docs ]; then cd docs/dirhlp; $(MAKE) $(MFLAGS) ; fi
-
-clientSDK: $(LDAP_LIBDIR) $(LDAP_BINDIR) $(LDAP_OBJDIR) 
-	cd include; $(MAKE) $(MFLAGS) clientSDK
-ifeq ($(ARCH), WINNT)
-	cd servers/slapd/ntmsgdll; $(MAKE) $(MFLAGS) all
-endif
-	cd libraries; $(MAKE) $(MFLAGS) clientSDK
-	cd clients/tools; $(MAKE) $(MFLAGS) clientSDK
-
-clean: 
-	cd include; $(MAKE) $(MFLAGS) clean
-	cd libraries; $(MAKE) $(MFLAGS) clean
-	cd servers; $(MAKE) $(MFLAGS) clean
-	cd admin; $(MAKE) $(MFLAGS) clean
-ifneq ($(ARCH), WINNT) # new unix installer
-	cd systools; $(MAKE) $(MFLAGS) clean
-	cd cm/newinst; $(MAKE) $(MFLAGS) clean
-else
-	cd cm/newinstnt; $(MAKE) $(MFLAGS) clean
-endif
-
-cleanSDK:
-	cd include; $(MAKE) $(MFLAGS) clean
-ifeq ($(ARCH), WINNT)
-	cd servers/slapd/ntmsgdll; $(MAKE) $(MFLAGS) clean
-endif
-	cd libraries; $(MAKE) $(MFLAGS) clean
-	cd clients/tools; $(MAKE) $(MFLAGS) clean
-
-veryclean:	clean
diff --git a/ldap/admin/Makefile b/ldap/admin/Makefile
deleted file mode 100644
index 6155b73c..00000000
--- a/ldap/admin/Makefile
+++ /dev/null
@@ -1,64 +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 Admin components
-#
-
-BUILD_ROOT = ../..
-LDAP_SRC = ../
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-all:
-	cd include; $(MAKE) $(MFLAGS) all
-	cd lib; $(MAKE) $(MFLAGS) all
-	cd src; $(MAKE) $(MFLAGS) all
-
-veryclean: clean
-
-clean:
-	cd include; $(MAKE) $(MFLAGS) clean
-	cd lib; $(MAKE) $(MFLAGS) clean
-	cd src; $(MAKE) $(MFLAGS) clean
diff --git a/ldap/admin/include/Makefile b/ldap/admin/include/Makefile
deleted file mode 100644
index fbc00719..00000000
--- a/ldap/admin/include/Makefile
+++ /dev/null
@@ -1,68 +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 Admin include directory.
-#
-
-BUILD_ROOT = ../../..
-LDAP_SRC = ../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-HDRDEST=$(LDAP_ADMROOT)/include
-
-HEADERS=dsalib.h dsalib_pw.h
-BINS=$(addprefix $(HDRDEST)/,$(HEADERS))
-
-all: $(HDRDEST) $(BINS) 
-
-strip:
-depend:
-
-clean:
-	-$(RM) $(BINS)
-
-$(HDRDEST)/%.h: %.h
-	-@$(RM) $@
-	$(CP) $< $@
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
deleted file mode 100644
index 6cd37b77..00000000
--- a/ldap/admin/lib/Makefile
+++ /dev/null
@@ -1,126 +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 Admin DLL/SO.
-#
-
-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 = $(LDAP_ADMOBJDIR)
-LIBDIR = $(LDAP_LIBDIR)
-ALIBDIR = $(LDAP_ADMLIBDIR)
-BINDIR=$(LDAP_ADMIN_BIN_RELDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-SRCS	= dsalib_location.c dsalib_debug.c dsalib_updown.c dsalib_tailf.c \
-	dsalib_ldif.c dsalib_db.c dsalib_conf.c dsalib_html.c \
-	dsalib_filename.c dsalib_util.c dsalib_dn.c dsalib_confs.c dsalib_pw.c
-
-OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS)))
-
-INCLUDES += -I$(LDAP_SRC)/admin/include
-
-SECURITYLINK += -lsoftokn3
-
-EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
-
-LIBS= $(LDAP_ADMDLLDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX)
-ifeq ($(ARCH), WINNT)
-IMPLIB= /IMPLIB:$(LDAP_ADMLIBDIR)/libds_admin.lib
-MAPFILE= /MAP:$(LDAP_ADMLIBDIR)/libds_admin.map
-EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) $(LDAP_LIBLDIF_DEP) 
-#EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLDAP_DLL) \
-#	$(ADMINUTIL_LINK) $(SECURITYLINK) $(NSPRLINK)
-endif # WINNT
-
-ifeq ($(ARCH), Linux)
-# XXXsspitzer:  we do this so that cgi's the link against libds_admin.so
-# will be able to find libns-dshttpd.so at run time.  Only platforms that
-# build with gcc need to do this. 
-RPATHFLAG_EXTRAS+=:../..:..
-endif # Linux
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP += $(LDAPSDK_DEP)
-#EXTRA_LIBS += $(LDAP_SDK_LIBLDAP_DLL) $(SECURITYLINK) $(ADMINUTIL_LINK) $(NSPRLINK) $(DBMLINK)
-LD=ld -noquiet
-endif
-
-# for Solaris, our most common unix build platform, we check for undefined symbols
-# at link time so we don't catch them at run time.  To do this, we set the -z defs
-# flag.  We also have to add -lc to the end because, even though ld and cc link with
-# it implicitly, -z defs will throw errors if we do not link with it explicitly
-ifeq ($(ARCH), SOLARIS)
-LINK_DLL += -z defs
-EXTRA_LIBS += -lc
-endif
-
-all:	$(LIBS) $(LDAP_ADMDLL_RELDLLS)
-
-$(LIBS): $(OBJDEST) $(LDAP_ADMDLLDIR) $(LDAP_ADMLIBDIR) $(OBJS) $(EXTRA_LIBS_DEP)
-	$(LINK_DLL) $(IMPLIB) $(MAPFILE) $(EXTRA_LIBS)
-
-ifeq ($(ARCH), WINNT)
-$(LDAP_ADMDLL_RELDLLS): $(LIBS) $(LDAP_ADMDLL_RELDIRS)
-	cp $< $@
-
-endif
-
-veryclean: clean
-
-clean:
-	-$(RM) $(OBJS)
-	-$(RM) $(LIBS)
-ifeq ($(ARCH), WINNT)
-	-$(RM) $(IMPLIB)
-endif
-
-$(OBJS): $(OBJDEST)/%.o: %.c 
-	$(CC) -c $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(OFFLAG)$(OBJDEST)/$*.o $*.c
-ifdef USE_LINT
-	$(LINT) $(LINTCCFLAGS) $(DEFS) $(MCC_SERVER) $(INCLUDES) $(MCC_INCLUDE) $*.c > $(OBJDEST)/$*.ln 2>&1
-endif
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
deleted file mode 100644
index f57a00d2..00000000
--- a/ldap/admin/src/Makefile
+++ /dev/null
@@ -1,391 +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
-#
-# Source for the admin forms and CGI programs
-
-LDAP_SRC = ../..
-BUILD_ROOT = ../../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-BINDIR=$(LDAP_ADMIN_BIN_RELDIR)
-OBJDEST=$(LDAP_ADMOBJDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-SCRIPTSDIR=$(RELDIR)/$(DS_DATADIR)/script-templates
-
-ifeq ($(USE_ADMINSERVER), 1)
-MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
-endif
-
-INCLUDES += -I$(LDAP_SRC)/admin/include
-
-DS_SERVER_DEFS = -DNS_DS -DIS_FHS
-
-ifneq ($(ARCH), WINNT)
-EXTRALDFLAGS += $(SSLLIBFLAG)
-endif
-
-ifeq ($(BUILD_DLL), yes)
-DYNAMIC_DEPLIBS=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS_DEP)
-ifeq ($(USE_ADMINSERVER), 1)
-  DYNAMIC_DEPLIBS += $(ADMINUTIL)
-endif
-DYNAMIC_DEPLINK=$(DYNAMIC_DEPLIBS)
-else
-DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS_DEP)
-DYNAMIC_DEPLINK=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS)
-endif
-
-EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP) $(SASL_DEP)
-ifeq ($(USE_ADMINSERVER), 1)
-  EXTRA_LIBS_DEP += $(ADMINUTIL_DEP)
-endif
-EXTRA_LIBS_DEP += $(ICU_DEP)
-# we don't want to build with warnings-as-errors for the admin/ stuff, because
-# it's got crappy C++ code which is LITTERED with warnings, most of which we
-# can't fix because it comes from files in dist/, etc.
-ifeq ($(ARCH), Linux)
-CFLAGS := $(subst -Werror,,$(CFLAGS))
-endif
-
-OLD_EXTRA_LIBS := $(EXTRA_LIBS)
-EXTRA_LIBS = $(DYNAMIC_DEPLINK) $(LDAP_NOSSL_LINK)
-ifeq ($(USE_ADMINSERVER), 1)
-  EXTRA_LIBS += $(ADMINUTIL_LINK)
-endif
-EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
-ifeq ($(USE_SETUPUTIL), 1)
-  EXTRA_LIBS += $(SETUPUTIL_S_LINK)
-endif
-EXTRA_LIBS += $(ICULINK) $(SASL_LINK) $(OLD_EXTRA_LIBS)
-
-# these are the libraries to use when building the installer for the open source version
-OPENSOURCE_LIBS = $(LDAP_ADMLIB) $(LDAP_NOSSL_LINK) $(SECURITYLINK) $(NSPRLINK)
-
-ifeq ($(ARCH), WINNT)
-PLATFORM_INCLUDE = -I$(BUILD_ROOT)/include/nt
-SUBSYSTEM=console
-EXTRA_LIBS+=comctl32.lib $(LDAP_LIBUTIL)
-OPENSOURCE_LIBS += comctl32.lib $(LDAP_LIBUTIL)
-EXTRA_LIBS_DEP+=$(LDAP_LIBUTIL_DEP)
-
-ifeq ($(DEBUG), optimize)
-#NT_NOLIBS = /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRT
-else
-NT_NOLIBS = /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRTD
-endif
-
-else
-ifeq ($(ARCH), IRIX)
-EXCEPTIONS=-exceptions
-else
-ifeq ($(ARCH),SOLARIS)
-ifeq ($(USE_64), 1)
-EXTRALDFLAGS += -xarch=v9
-endif
-EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
-OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
-else
-ifeq ($(ARCH),SOLARISx86)
-EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
-OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
-else
-ifeq ($(ARCH),HPUX)
-  ifeq ($(NSOS_RELEASE),B.11.23)
-    ifeq ($(USE_64), 1)
-      EXTRALDFLAGS += +DD64
-    endif
-  else
-    ifeq ($(USE_64), 1)
-      EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
-    endif
-  endif
-else
-ifeq ($(ARCH),OSF1)
-#CC += -E
-#CXX += -Wl,-ymain
-else
-ifeq ($(ARCH),ReliantUNIX)
-else
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += -lcurses
-else
-ifeq ($(ARCH), UnixWare)
-# rgc:
-EXTRA_LIBS += -lsocket -lnsl -lgen -lm
-else 
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS += -lcrypt
-else
-#this will help with porting other platforms
-EXTRA_LIBS+="you need to define EXTRA_LIBS for $(ARCH) in ldap/admin/src/Makefile"
-endif # Linux
-endif # UnixWare
-endif # AIX
-endif # ReliantUNIX
-endif # OSF1
-endif # HPUX
-endif # SOLARISx86
-endif # SOLARIS
-endif # IRIX
-endif # WINNT
-
-ifneq ($(ARCH), WINNT)
-TEMP_EXTRALDFLAGS:=$(EXTRALDFLAGS)
-EXTRALDFLAGS = -lpthread $(TEMP_EXTRALDFLAGS)
-endif
-
-ifeq ($(SECURITY),domestic)
-SECUS_BINS=
-MODULE_CFLAGS += -DUS_VERSION -DEXPORT_VERSION
-endif
-
-ifeq ($(SECURITY),export)
-MODULE_CFLAGS += -DEXPORT_VERSION
-endif
-
-ifneq ($(SECURITY),none)
-SECURE_BINS=
-SECLIB=$(LIBSECURITY)
-endif
-
-ifeq ($(USE_ADMINSERVER), 1)
-  ADMIN_DLLGLUEOBJ=$(BUILD_ROOT)/built/$(ARCH)-$(SECURITY)-$(DEBUG)-admin/admin-lib/dllglue.o
-endif
-
-ifeq ($(ARCH),AIX)
-DLLGLUEOBJ=
-GLUEOBJS=
-endif
-
-$(OBJDEST)/key.res: key.rc
-	$(RC) $(OFFLAG)$(OBJDEST)/key.res ey.rc
-
-PROGS = ds_newinst
-ifeq ($(USE_ADMINSERVER), 1)
-PROGS += start   restart  shutdown   ds_ldif2db \
-	ds_db2ldif   ds_db2bak   ds_listdb  \
-	ds_bak2db ds_rmdb ds_create \
-	ds_remove ds_snmpctrl vlvindex addindex
-endif
-
-ifeq ($(ARCH), WINNT)
-SERVER_PROGS = namegen latest_file
-endif
-
-ifeq ($(USE_ADMINSERVER), 1)
-OBJECTS= init_ds_env.o
-endif
-
-ifeq ($(ARCH), WINNT)
-OBJECTS += namegen.o latest_file.o
-ifeq ($(USE_SETUPUTIL), 1)
-  OBJECTS += ds_remove_uninst.o
-endif
-endif
-
-ifeq ($(ARCH), WINNT)
-BINS = $(addprefix $(BINDIR)/, $(addsuffix .exe, $(PROGS))) $(addprefix $(LDAP_SERVER_RELDIR)/, $(addsuffix .exe, $(SERVER_PROGS)))
-else
-BINS = $(addprefix $(BINDIR)/, $(PROGS))
-endif
-ALLOBJS = $(addprefix $(OBJDEST)/, $(OBJECTS))
-
-PERL_SCRIPTS = migrateTo4 uname.lib Cgi.pm migrateInstance getConfigInfo migrateLocalDB migratePwdFile ds_viewlog.pl upgradeServer updatedsgw logconv.pl ds_newinst.pl
-
-PERL_SCRIPTS_DEST = $(addprefix $(BINDIR)/, $(PERL_SCRIPTS))
-
-INST_INCLUDES = $(OBJDIR)/install_keywords.h
-
-TEMPLATE_SCRIPTS_SRC = $(wildcard scripts/template-*)
-TEMPLATE_SCRIPTS_DEST = $(subst scripts/,$(SCRIPTSDIR)/,$(TEMPLATE_SCRIPTS_SRC))
-
-# we wrap the security tools with a shell script wrapper for their ld libpath
-PACKAGE_SEC_TOOLS = $(addprefix $(RELDIR)/usr/bin/,$(SECURITY_TOOLS))
-
-# We only need to do this if we have to ship 32 bit binaries in our 64 bit packages
-# Right now, on rhel/linux, we ship all native 64 bit apps so we don't have to do
-# this.  We still may need to do this on solaris/hpux, but hopefully not for very
-# much longer
-ifeq ($(USE_64), 1)
-  ifeq ($(ARCH), RHEL)
-    FIX_SECMOD_DEP =
-  else
-  ifeq ($(ARCH), Linux)
-    FIX_SECMOD_DEP =
-  else
-    FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64
-  endif
-  endif
-endif
-
-# gmake 3.74 will remove "intermediate" files if generated via a pattern match rule
-# this is annoying for debugging since it tries to find the .o file
-# if you're debugging and you want to make sure your file does not get removed
-# by gmake, just uncomment the precious target and put your object files there
-# or FIX IT! if you can figure out how . . .
-#.PRECIOUS: $(OBJDEST)/ds_db2bak.o
-
-all: $(BINDIR) $(OBJDEST) $(INST_INCLUDES) $(ALLOBJS) $(BINS) \
-	installPerlFiles $(SCRIPTSDIR) $(TEMPLATE_SCRIPTS_DEST) \
-	$(FIX_SECMOD_DEP) $(PACKAGE_SEC_TOOLS)
-
-$(SCRIPTSDIR):
-	$(MKDIR) $@
-
-.PHONY: installPerlFiles
-
-clean:
-	-@echo $(BINS)
-	-$(RM) $(BINS)
-	-$(RM) $(OBJDEST)/*.o
-
-strip:
-	$(STRIP) $(BINS)
-
-# if $(DLLGLUEOBJ) isn't available, use $(ADMIN_DLLGLUEOBJ) as a substitute:
-$(DLLGLUEOBJ): $(ADMIN_DLLGLUEOBJ)
-	cp $(ADMIN_DLLGLUEOBJ) $(DLLGLUEOBJ)
-
-# if $(SECGLUEOBJ) isn't available, use $(ADMIN_SECGLUEOBJ) as a substitute:
-$(SECGLUEOBJ): $(ADMIN_SECGLUEOBJ)
-	cp $(ADMIN_SECGLUEOBJ) $(SECGLUEOBJ)
-
-# Special objects
-$(BINDIR)/ds_newinst:	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o
-	$(LINK_EXE_NOLIBSOBJS) $(SHARED) $(EXTRALDFLAGS) \
-	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o $(EXTRA_LIBS)
-
-$(BINDIR)/ds_newinst.exe:	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o
-	$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o \
-		$(LIBNT) $(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
-# linking this file causes a .exp and a .lib file to be generated which don't seem
-# to be required while running, so I get rid of them
-	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
-
-$(BINDIR)/ds_create:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/configure_instance.o \
-	$(OBJDEST)/script-gen.o $(DEPLIBS)
-	$(LINK_EXE_NOLIBSOBJS) $(SHARED) $(EXTRALDFLAGS) \
-		$(OBJDEST)/instindex.o $(OBJDEST)/script-gen.o \
-		$(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \
-		$(OBJDEST)/configure_instance.o \
-		$(GLUEOBJ) $(EXTRA_LIBS)
-
-$(BINDIR)/ds_create.exe:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/configure_instance.o \
-	$(OBJDEST)/script-gen.o $(LIBNT_DEP) $(DEPLIBS)
-	$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/instindex.o \
-		$(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \
-		$(OBJDEST)/configure_instance.o $(OBJDEST)/script-gen.o \
-		$(SETUPUTIL_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
-		$(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
-# linking this file causes a .exp and a .lib file to be generated which don't seem
-# to be required while running, so I get rid of them
-	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
-
-$(BINDIR)/ds_remove:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
-	$(LINK_EXE_NOLIBSOBJS)  $(SHARED) $(EXTRALDFLAGS) \
-		$(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/init_ds_env.o \
-		$(SETUPUTIL_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
-
-$(BINDIR)/ds_remove.exe:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
-	$(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPUTIL_S_LINK) $(NT_NOLIBS)
-# linking this file causes a .exp and a .lib file to be generated which don't seem
-# to be required while running, so I get rid of them
-	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
-
-$(OBJDEST)/%.o: %.c
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $< $(OFFLAG)$@
-
-$(OBJDEST)/%.o: %.cpp
-ifeq ($(ARCH), WINNT)
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
-else
-	$(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
-endif
-
-ifneq ($(ARCH), WINNT)
-$(BINDIR)/%: $(OBJDEST)/%.o  $(DEPLIBS) $(EXTRA_LIBS_DEP) $(GLUEOBJ)
-	$(LINK_EXE_NOLIBSOBJS) $< $(OBJDEST)/init_ds_env.o $(GLUEOBJ) $(EXTRA_LIBS)
-else
-$(BINDIR)/%.exe:  $(OBJDEST)/%.o $(DEPLIBS) $(EXTRA_LIBS_DEP) 
-	$(LINK_EXE) $(OBJDEST)/$*.o $(OBJDEST)/init_ds_env.o $(NSPRLINK) 
-endif
-
-$(LDAP_SERVER_RELDIR)/namegen.exe:  $(OBJDEST)/namegen.o
-	$(LINK_EXE_NOLIBSOBJS) $^
-
-$(LDAP_SERVER_RELDIR)/latest_file.exe:  $(OBJDEST)/latest_file.o
-	$(LINK_EXE_NOLIBSOBJS) $^
-
-installPerlFiles:  $(BINDIR) $(PERL_SCRIPTS_DEST)
-
-$(BINDIR)/%: %
-	-@$(RM) $@
-	$(CP) $< $@
-	chmod +x $@
-
-$(LDAP_SERVER_RELDIR)/%: % $(LDAP_SERVER_RELDIR)
-	-@$(RM) $@
-	$(CP) $< $@
-	chmod +x $@
-
-$(INST_INCLUDES): install_keywords.h
-	-@$(RM) $@
-	$(CP) $< $@
-
-$(SCRIPTSDIR)/template-%: scripts/template-% $(SCRIPTSDIR)
-	-@$(RM) $@
-	$(CP) $< $@
-	chmod +x $@
-
-$(RELDIR)/usr/bin/%: sec_tools_wrapper $(RELDIR)/usr/bin
-	-@$(RM) $@
-	$(CP) $< $@
-	chmod +x $@
-
diff --git a/ldap/clients/dsgw/dsgw_include.mk b/ldap/clients/dsgw/dsgw_include.mk
deleted file mode 100644
index 66d6d43d..00000000
--- a/ldap/clients/dsgw/dsgw_include.mk
+++ /dev/null
@@ -1,54 +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
-
-# These are macro definitions for use by components of the dsgw
-DSGW_DEFAULT_LANG = en
-DSGW_BASE_RELDIR = $(RELDIR)/clients/dsgw
-DSGW_BIN_RELDIR = $(DSGW_BASE_RELDIR)/bin
-DSGW_HTML_RELDIR = $(DSGW_BASE_RELDIR)/html
-DSGW_CONF_RELDIR = $(DSGW_BASE_RELDIR)/config
-DSGW_PBHTML_RELDIR = $(DSGW_BASE_RELDIR)/pbhtml
-DSGW_PBCONF_RELDIR = $(DSGW_BASE_RELDIR)/pbconfig
-DSGW_MAN_RELDIR = $(RELDIR)/manual/$(DSGW_DEFAULT_LANG)/slapd/gw/manual
-DSGW_INFO_RELDIR = $(RELDIR)/manual/$(DSGW_DEFAULT_LANG)/slapd/gw/info
-
-# generic target to be used to make any directory dependencies
-$(DSGW_BIN_RELDIR) $(DSGW_HTML_RELDIR) $(DSGW_CONF_RELDIR) $(DSGW_PBHTML_RELDIR) \
-	$(DSGW_PBCONF_RELDIR) $(DSGW_MAN_RELDIR) $(DSGW_INFO_RELDIR) \
-	$(DSGW_CONF_RELDIR)/$(DSGW_DEFAULT_LANG) :
-	mkdir -p $@
diff --git a/ldap/include/Makefile b/ldap/include/Makefile
deleted file mode 100644
index 7caa3ae3..00000000
--- a/ldap/include/Makefile
+++ /dev/null
@@ -1,81 +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 ldap/include
-#
-
-LDAP_SRC = ..
-BUILD_ROOT = ../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifneq ($(ARCH), WINNT)
-PROT= -m 644
-endif
-
-all:	FORCE
-
-clientSDK: $(LDAP_INCLUDEDIR) all FORCE
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) ldap.h $(LDAP_INCLUDEDIR)
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) lber.h $(LDAP_INCLUDEDIR)
-ifneq ($(LDAP_NO_LIBLCACHE),1)
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) lcache.h $(LDAP_INCLUDEDIR)
-endif
-
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) ldap_ssl.h $(LDAP_INCLUDEDIR)
-
-install: $(LDAP_INCLUDEDIR) clientSDK FORCE
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) disptmpl.h $(LDAP_INCLUDEDIR)
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) srchpref.h $(LDAP_INCLUDEDIR)
-		$(INSTALL) $(INSTALLFLAGS) $(PROT) portable.h $(LDAP_INCLUDEDIR)
-
-depend:	FORCE
-
-clean:	FORCE
-	-$(RM) db.h sys btree.h extern.h mpool.h
-
-veryclean:	clean
-
-FORCE:
diff --git a/ldap/include/Makefile.client b/ldap/include/Makefile.client
deleted file mode 100644
index e67eafd1..00000000
--- a/ldap/include/Makefile.client
+++ /dev/null
@@ -1,86 +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
-#
-DEPTH		= ../..
-
-CHMOD		= chmod
-RM		= rm -f
-SED		= sed
-
-HEADERS		= \
-		  disptmpl.h \
-		  lber.h \
-		  ldap.h \
-		  srchpref.h \
-		  $(NULL)
-
-include $(DEPTH)/config/rules.mk
-
-GARBAGE		+= sdkver.h dirver.h
-
-ETCDIR		= $(DIST)/etc
-INCLUDEDIR	= $(XPDIST)/public/ldap
-
-DIR_VERSION	:= 2.0
-DIRSDK_VERSION	:= 1.0
-
-ifeq ($(OS_ARCH), WINNT)
-# Is this correct?
-DIRVER_PATH	= $(DEPTH)/ldap/build
-else
-DIRVER_PATH	= $(DIST)/bin
-endif
-
-DIRVER_PROG	= $(DIRVER_PATH)/dirver$(BIN_SUFFIX)
-
-###########################################################################
-
-all export::	sdkver.h dirver.h FORCE
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(DIST)/include
-
-sdkver.h:	$(DIRVER_PROG)
-	@$< $(DIRSDK_VERSION) UseSystemDate $@
-
-dirver.h:	$(DIRVER_PROG)
-	@$< $(DIR_VERSION) UseSystemDate $@
-
-install::	export
-
-FORCE:
diff --git a/ldap/javarules.mk b/ldap/javarules.mk
deleted file mode 100644
index a133492e..00000000
--- a/ldap/javarules.mk
+++ /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
-#
-# javarules.mk
-#
-# Identify tools, directories, classpath for building the Directory
-# console
-
-# Where the source root is
-JAVA_SRC_DIR=$(ABS_ROOT)/ldap/admin/src/java
-
-# Where the class files go
-JAVA_BUILD_DIR=$(ABS_ROOT)/built/java/$(BUILD_DEBUG)/admin
-JAVA_DEST_DIR=$(BUILD_ROOT)/built/java/$(BUILD_DEBUG)
-CLASS_DIR=$(JAVA_DEST_DIR)/admin
-DSADMIN_DIR=$(CLASS_DIR)/com/netscape/admin
-
-# Where docs go
-DSADMIN_DOC_DIR=$(JAVA_DEST_DIR)/doc
-
-
-# Java setup ##############################################
-
-# disable optimized builds for now until we can figure out why
-# optimized doesn't build . . .
-ifeq ($(BUILD_DEBUG),optimize)
-#  JAVAFLAGS=-O
-  JAVAFLAGS=
-else
-  JAVAFLAGS=-g
-endif
-
-PATH_SEP := :
-ifeq ($(OS), Windows_NT)
-  GET_JAVA_FROM_PATH := 1
-  PATH_SEP := ;
-  EXE_SUFFIX := .exe
-endif
-
-ifeq ($(INTERNAL_BUILD), 1)
-  # For UNIX, use JDK and JAR files over NFS
-  ifeq ($(ARCH), Linux)
-    JDK_VERSION:=1.4.2_SR3
-    JDK_VERSDIR:=ibmjdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
-  else
-    ifeq ($(ARCH), HPUX)
-      JDK_VERSION:=1.4.2_09
-      JDK_VERSDIR:=hpjdk/$(JDK_VERSION)
-    else # Solaris
-      JDK_VERSION:=1.4.2_10
-      JDK_VERSDIR:=jdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
-    endif
-  endif	
-  JDKLIB:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/lib/tools.jar
-  JAVABINDIR:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/bin
-else # INTERNAL_BUILD
-  # Figure out where the java lib .jar files are, from where javac is
-  JDKCOMP := $(shell which javac)
-  JDKPRELIB := $(subst bin/javac$(EXE_SUFFIX),lib,$(JDKCOMP))
-  JDKLIB := $(addprefix $(JDKPRELIB)/,tools.jar)
-endif 
-	
-CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
-
-ifndef JAVA
-  ifdef JAVABINDIR
-    JAVA= $(JAVABINDIR)/java
-  else
-    JAVA=java
-  endif
-endif
-
-# Some java compilers run out of memory, so must be run as follows
-JAVAC_PROG=-mx32m sun.tools.javac.Main
-HEAVY_JAVAC=$(JAVA) $(JAVAC_PROG) $(JAVAFLAGS)
-
-ifndef JAVAC
-  ifdef JAVABINDIR
-    JAVAC= $(JAVABINDIR)/javac $(JAVAFLAGS)
-  else
-    JAVAC= javac $(JAVAFLAGS)
-  endif
-endif
-ifndef JAVADOC
-  JAVADOC=$(JAVA) -mx64m sun.tools.javadoc.Main -classpath "$(CLASSPATH)"
-endif
-
-# How to run ant (the Java "make" system)
-ifdef GET_ANT_FROM_PATH
-ANT = ant
-else
-ANT = $(JAVA) -Dant.home=$(ANT_HOME) -classpath "$(ANT_CP)$(PATH_SEP)$(JDKLIB)" org.apache.tools.ant.Main
-endif
-
-##########################################################
diff --git a/ldap/libraries/Makefile b/ldap/libraries/Makefile
deleted file mode 100644
index 2b312baa..00000000
--- a/ldap/libraries/Makefile
+++ /dev/null
@@ -1,396 +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
-
-OBJDEST = $(OBJDIR)/lib
-LIBDIR = $(LDAP_LIBDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-# the following lines are to make this work for
-# both db1.85 and db2.0
-ifndef LDAP_USE_OLD_DB
-ldap_db_depend:=$(DB_LIB_DEP)
-CFLAGS+= -I$(DB_INCLUDE)
-else
-ldap_db_depend:=_berkeley_db
-endif
-
-ifeq ($(ARCH), WINNT)
-LDAPRES=	$(addprefix $(LIBDIR)/, libldap/*.res)
-LCACHERES=	$(addprefix $(LIBDIR)/, liblcache/*.res)
-endif
-
-########## Security #######################
-##########ifneq ($(SECURITY), none)
-
-# Where to find libsec and friends
-SECDIR=$(NSCP_DISTDIR)/lib
-
-ifeq ($(ARCH), WINNT)
-# Used by libsec in Win32
-SEC_SYSLIBS=rpcrt4.lib user32.lib
-# When pulling in libsec/nspr20, WinSock and WinMM must be linked in
-ifdef INCLUDE_SSL
-EXTRA_LIBS=winmm.lib wsock32.lib
-SDK_EXPORT_DEFS=ldapsdk.def
-SDK_EXPORT_DEPS=msdos/winsock/nsldap32.def msdos/winsock/ldapssl.def
-else
-SDK_EXPORT_DEFS=msdos/winsock/nsldap32.def
-endif
-SDK_EXPORT_FLAGS=/DEF:$(SDK_EXPORT_DEFS)
-LCACHE_EXPORT_DEFS=msdos/winsock/nslch32.def
-LCACHE_EXPORT_FLAGS=/DEF:$(LCACHE_EXPORT_DEFS)
-endif
-
-EXPLDAP=libldap
-EXPLCH=liblcache
-EXPLDSSL=libldap_ssl
-
-ifeq ($(ARCH), AIX)
-USE_DLL_EXPORTS_FILE=1
-else
-ifeq ($(ARCH), SOLARIS)
-USE_DLL_EXPORTS_FILE=1
-else
-ifeq ($(ARCH), IRIX)
-USE_DLL_EXPORTS_FILE=1
-endif
-endif
-endif
-
-
-ifeq ($(USE_DLL_EXPORTS_FILE), 1)
-ifdef INCLUDE_SSL
-SDK_EXPORT_DEFS=$(OBJDEST)/$(EXPLDAP).exp $(OBJDEST)/$(EXPLDSSL).exp
-DLL_EXPORT_FLAGS=$(SDK_EXPORT_DEFS)
-else
-SDK_EXPORT_DEFS=$(OBJDEST)/$(EXPLDAP).exp
-endif
-DLL_EXPORT_FLAGS=$(addprefix $(DLLEXPORTS_PREFIX), $(SDK_EXPORT_DEFS))
-LCACHE_EXPORT_DEFS=$(OBJDEST)/$(EXPLCH).exp
-DLL_EXPORT_FLAGS2=$(addprefix $(DLLEXPORTS_PREFIX), $(LCACHE_EXPORT_DEFS))
-endif
-
-
-EXTRA_SECLIBS=	$(STATICLIBNSPR) $(LIBSEC) $(LIBXP) $(LIBDB) $(LIBARES) \
-	$(LIBSSLIO) $(SEC_SYSLIBS)
-EXTRA_SECLIBS_DEP += $(STATICLIBNSPR) $(LIBXP_DEP) \
-	$(LIBSSLIO_DEP)
-EXTRA_SECLIBS_DEP += $(LIBSEC_DEP) $(LIBDB_DEP) $(LIBARES_DEP)
-
-ifdef INCLUDE_SSL
-#
-# include security code in the LDAP DLL
-#
-EXTRA_LIBS += $(EXTRA_SECLIBS)
-EXTRA_LIBS_DEP += $(EXTRA_SECLIBS_DEP)
-ifneq ($(ARCH), WINNT)
-DLL_LDFLAGS	+= -$(LIBPATH)$(SECDIR)
-endif
-
-SSLOBJS= $(addprefix $(LIBDIR)/, libssldap/*.o)
-SSL_DEP= $(LDAPSDK_DEP)
-
-endif
-########## end Security ###################
-
-# The following libraries are built by this Makefile:
-# dynamic LDAP library
-DLIBLDAP=	$(addprefix $(LIBDIR)/, $(LIBLDAP_DLL).$(DLL_SUFFIX))
-# static LDAP library
-SLIBLDAP=	$(addprefix $(LIBDIR)/, $(LIBLDAP_LIB).$(LIB_SUFFIX))
-# dynamic LCACHE library
-DLIBLCACHE=	$(addprefix $(LIBDIR)/, $(LIBLCACHE_DLL).$(DLL_SUFFIX))
-# static LCACHE library
-SLIBLCACHE=	$(addprefix $(LIBDIR)/, $(LIBLCACHE_LIB).$(LIB_SUFFIX))
-
-# objects built by libavl/Makefile
-AVLOBJS=	 $(addprefix $(LIBDIR)/, libavl/*.o)
-# objects built by berkeley_db/Makefile
-# the following lines pull in the new db library with the liblcache dll is built
-# this is a hack, but can't see how to add it easier without a new LINK_DLL2.
-ifndef LDAP_USE_OLD_DB
-DLL_EXPORT_FLAGS2+=$(DB_STATIC_LIB)
-else
-BERKDBOBJS=	 $(addprefix $(LIBDIR)/, libdb/*.o)
-endif
-# objects built by liblber/Makefile
-LBEROBJS=	$(addprefix $(LIBDIR)/, liblber/*.o)
-# objects built by liblcache/Makefile
-LCACHEOBJS=	 $(addprefix $(LIBDIR)/, liblcache/*.o)
-# objects built by libldap/Makefile
-LDAPOBJS=	$(addprefix $(LIBDIR)/, libldap/*.o)
-# one object built by libldap/Makefile
-REGEXOBJ=	$(addprefix $(LIBDIR)/, libldap/regex.o)
-# objects built by libldbm/Makefile
-LDBMOBJS=	 $(addprefix $(LIBDIR)/, libldbm/*.o)
-# objects built by libldif/Makefile
-LDIFOBJS=	 $(addprefix $(LIBDIR)/, libldif/*.o)
-
-all: $(LDAP_LIBDIR) clientSDK
-
-buildDirectory: $(LDAP_LIBDIR) _libavl _libldif _liblitekey _libutil
-
-ifdef LDAP_USE_OLD_DB
-_berkeley_db:
-	cd berkeley_db; $(MAKE) $(MFLAGS) all
-endif
-
-_libavl:
-	cd libavl; $(MAKE) $(MFLAGS) all
-
-_liblber:
-	cd liblber; $(MAKE) $(MFLAGS) all
-
-_libldbm:
-	cd libldbm; $(MAKE) $(MFLAGS) all
-
-_libldif:
-	cd libldif; $(MAKE) $(MFLAGS) all
-
-_liblitekey:
-	cd liblitekey; $(MAKE) $(MFLAGS) all
-
-_libssldap:
-	cd libssldap; $(MAKE) $(MFLAGS) all
-
-_libutil:
-ifeq ($(ARCH), WINNT)
-	cd libutil; $(MAKE) $(MFLAGS) all
-endif
-
-_libldap:
-	cd libldap; $(MAKE) $(MFLAGS) all
-
-_slapd:
-	cd $(LDAP_SRC)/servers/slapd; $(MAKE) $(MFLAGS) all
-
-_back-ldbm:
-	cd $(LDAP_SRC)/servers/slapd/back-ldbm; $(MAKE) $(MFLAGS) all
-
-_back-ldif:
-	cd $(LDAP_SRC)/servers/slapd/back-ldif; $(MAKE) $(MFLAGS) all
-
-_liblcache:
-	cd liblcache; $(MAKE) $(MFLAGS) clientSDK
-
-ifdef INCLUDE_SSL
-#
-# There is no easy way to include libsec and friends when making static libs
-# (at least on UNIX) so we don't bother making them when INCLUDE_SSL is set.
-# Also if LDAP_NO_LIBLCACHE is 1, we don't build liblcache.  Simple, huh?
-#
-ifeq ($(LDAP_NO_LIBLCACHE),1)
-LIBS2BUILD=$(DLIBLDAP)
-else
-LIBS2BUILD=$(DLIBLDAP) $(DLIBLCACHE)
-endif
-else
-ifeq ($(LDAP_NO_LIBLCACHE),1)
-LIBS2BUILD=$(DLIBLDAP) $(SLIBLDAP)
-else
-LIBS2BUILD=$(DLIBLDAP) $(SLIBLDAP) $(DLIBLCACHE) $(SLIBLCACHE)
-endif
-
-endif
-
-clientSDK: $(LDAP_LIBDIR) _libavl _liblber _libldif \
-		_libssldap _libutil $(LIBS2BUILD) 
-
-OBJS=$(LBEROBJS) $(LDAPOBJS) $(SSLOBJS) $(LDAPRES)
-
-$(DLIBLDAP): $(LDAP_OUT_DIR) _liblber _libldap $(EXTRA_LIBS_DEP) $(SSL_DEP) \
-				$(SDK_EXPORT_DEFS) 
-	$(LINK_DLL) $(SDK_EXPORT_FLAGS) $(EXTRA_LIBS)
-
-$(SLIBLDAP): $(LDAP_OUT_DIR) _liblber _libldap $(EXTRA_LIBS_DEP) $(SSL_DEP)
-	$(LINK_LIB)
-
-OBJS2=$(LCACHEOBJS) $(AVLOBJS) $(LDBMOBJS) $(BERKDBOBJS) $(LDIFOBJS) \
-	$(REGEXOBJ) $(LCACHERES)
-
-ifeq ($(ARCH), WINNT)
-# liblber is included here only to pick up ber_err_print()
-# libsec and libxp are included here only to pick up SHA1_Hash()
-OTHER_SECLIBS=	$(LIBSEC) $(LIBXP)
-EXTRA_LCACHE_LIBS=$(LDAP_SDK_LIBLDAP_DLL) $(LDAP_LIBLBER) $(OTHER_SECLIBS)
-EXTRA_LCACHE_LIBS_DEP= $(LDAP_SDK_LIBLDAP_DLL_DEP) $(LDAP_LIBLBER_DEP) \
-	$(EXTRA_SECLIBS_DEP)
-endif
-
-ifeq ($(ARCH), AIX)
-DLL_LDFLAGS     += -$(LIBPATH)$(SECDIR)
-# extra libraries are needed on AIX as well
-EXTRA_LCACHE_LIBS=$(LDAP_SDK_LIBLDAP_DLL) $(LDAP_LIBLBER) $(EXTRA_SECLIBS)
-EXTRA_LCACHE_LIBS_DEP= $(LDAP_SDK_LIBLDAP_DLL_DEP) $(LDAP_LIBLBER_DEP) \
-        $(EXTRA_SECLIBS_DEP)
-endif
-
-$(DLIBLCACHE): $(LDAP_OUT_DIR) $(ldap_db_depend) _liblcache _libavl _libldbm \
-		_libldif $(EXTRA_LCACHE_LIBS_DEP) $(LCACHE_EXPORT_DEFS)
-	$(LINK_DLL2) $(LCACHE_EXPORT_FLAGS) $(EXTRA_LCACHE_LIBS) $(EXTRA_LIBS)
-
-$(SLIBLCACHE): $(LDAP_OUT_DIR) $(ldap_db_depend) _liblcache libavl _libldbm \
-		_libldif
-	$(LINK_LIB2)
-
-# Need to add exports if building with SSL in NT
-ifeq ($(ARCH), WINNT)
-ifdef INCLUDE_SSL
-$(SDK_EXPORT_DEFS) : $(SDK_EXPORT_DEPS)
-	cat $(SDK_EXPORT_DEPS) > $(SDK_EXPORT_DEFS)
-endif
-endif
-
-clean: FORCE
-ifdef LDAP_USE_OLD_DB
-	cd berkeley_db; $(MAKE) $(MFLAGS) clean
-endif
-	cd libavl; $(MAKE) $(MFLAGS) clean
-	cd libldif; $(MAKE) $(MFLAGS) clean
-ifeq ($(ARCH), WINNT)
-	cd libutil; $(MAKE) $(MFLAGS) clean
-	-(cd $(LDAP_SRC)/servers/slapd; $(MAKE) $(MFLAGS) clean)
-endif
-	-(cd $(LDAP_SRC)/servers/slapd/back-ldbm; $(MAKE) $(MFLAGS) clean)
-	-(cd $(LDAP_SRC)/servers/slapd/back-ldif; $(MAKE) $(MFLAGS) clean)
-ifeq ($(ARCH), WINNT)
-	-$(RM) $(LIBLDAP_DLL_OBJ)
-endif
-	-$(RM) $(LIBS2BUILD)
-
-veryclean:	clean
-
-FORCE:
-
-$(LDAP_OUT_DIR):
-	$(MKDIR) $(LDAP_OUT_DIR)
-
-GENEXPORTS=$(PERL) $(LDAP_SRC)/build/genexports.pl
-# WINDEFDIR is now defined below via a recursive make.  This is a
-# bit of a hack to avoid collisions with SDK_EXPORT_DEFS (defined above).
-#WINDEFDIR=msdos/winsock
-MACDEFDIR=macintosh
-GENEXPARGS=$(BUILD_DEBUG) $(DIRSDK_VERSION_DLL_SUFFIX) $(DIRSDK_VERSION)
-
-DEFLDAPW32=$(WINDEFDIR)/nsldap32
-DEFLDAPW16REV=$(WINDEFDIR)/nsldap
-DEFLDAPW16=$(WINDEFDIR)/libldap
-DEFLDAPW32BC=$(WINDEFDIR)/nsldap32bc
-DEFLDSSLW32=$(WINDEFDIR)/ldapssl
-DEFLDSSLW32BC=$(WINDEFDIR)/ldapsslbc
-DEFLCHW32=$(WINDEFDIR)/nslch32
-DEFLCHW32BC=$(WINDEFDIR)/nslch32bc
-DEFLDAPMACPPC=$(MACDEFDIR)/libldap-PPC.u
-DEFLDAPMACCLIENTPPC=$(MACDEFDIR)/LDAPClientPPC.prj
-DEFLDAPMACCLIENT68K=$(MACDEFDIR)/LDAPClient68K.prj
-
-# nsdefs.mk contains version number definitions....
-OTHERDEFDEPS=$(BUILD_ROOT)/nsdefs.mk
-
-exportfiles:
-	$(MAKE) $(MFLAGS) WINDEFDIR=msdos/winsock doExportFiles
-
-doExportFiles:	$(DEFLDAPW32).def $(DEFLDAPW16).def $(DEFLDAPW16REV).def \
-	$(DEFLDAPW32BC).def $(DEFLDSSLW32).def $(DEFLDSSLW32BC).def \
-	$(DEFLCHW32).def $(DEFLCHW32BC).def \
-	$(DEFLDAPMACPPC).exp $(DEFLDAPMACCLIENTPPC).exp \
-	$(DEFLDAPMACCLIENT68K).exp
-
-#
-# All the various flavors of Windows:
-#
-$(DEFLDAPW32).def:	$(DEFLDAPW32).tdf libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) Win32 $< libldap.ex $(GENEXPARGS) > $@
-
-$(DEFLDAPW16).def:	$(DEFLDAPW16).tdf libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) Win16 $< libldap.ex $(GENEXPARGS) > $@
-
-$(DEFLDAPW16REV).def:	$(DEFLDAPW16REV).tdf libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) Win16Rev $< libldap.ex $(GENEXPARGS) > $@
-
-$(DEFLDAPW32BC).def:	$(DEFLDAPW32BC).tdf libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) WinBC $< libldap.ex $(GENEXPARGS) > $@
-
-$(DEFLDSSLW32).def:	$(DEFLDSSLW32).tdf libldap_ssl.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) Win32 $< libldap_ssl.ex $(GENEXPARGS) > $@
-
-$(DEFLDSSLW32BC).def:	$(DEFLDSSLW32BC).tdf libldap_ssl.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) WinBC $< libldap_ssl.ex $(GENEXPARGS) > $@
-
-$(DEFLCHW32).def:	$(DEFLCHW32).tdf liblcache.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) Win32 $< liblcache.ex $(GENEXPARGS) > $@
-
-$(DEFLCHW32BC).def:	$(DEFLCHW32BC).tdf liblcache.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) WinBC $< liblcache.ex $(GENEXPARGS) > $@
-
-#
-# MacOS:
-#
-$(DEFLDAPMACPPC).exp:		libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) MacOS Standard $< $(GENEXPARGS) > $@
-
-$(DEFLDAPMACCLIENTPPC).exp:	libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) MacOS Standard $< $(GENEXPARGS) > $@
-
-$(DEFLDAPMACCLIENT68K).exp:	libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) MacOS Standard $< $(GENEXPARGS) > $@
-
-ifeq ($(USE_DLL_EXPORTS_FILE), 1)
-# generic rules to create standard export/map files
-$(OBJDEST)/$(EXPLDAP).exp:	libldap.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) $(ARCH) Standard $< $(GENEXPARGS) > $@
-
-$(OBJDEST)/$(EXPLDSSL).exp:	libldap_ssl.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) $(ARCH) Standard $< $(GENEXPARGS) > $@
-
-$(OBJDEST)/$(EXPLCH).exp:	liblcache.ex $(OTHERDEFDEPS)
-	$(GENEXPORTS) $(ARCH) Standard $< $(GENEXPARGS) > $@
-endif
diff --git a/ldap/libraries/libavl/Makefile b/ldap/libraries/libavl/Makefile
deleted file mode 100644
index e79c2f1e..00000000
--- a/ldap/libraries/libavl/Makefile
+++ /dev/null
@@ -1,80 +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 libavl
-#
-
-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/libavl
-LIBDIR = $(LDAP_LIBDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-CFLAGS +=	$(SLCFLAGS)
-
-LIBAVL_OBJS=	avl.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(LIBAVL_OBJS)) 
-
-LIBAVL=	$(addprefix $(LIBDIR)/, libavl.$(LIB_SUFFIX))
-
-clientSDK: all
-
-all:	$(OBJDEST) $(LIBDIR) $(LIBAVL)
-
-$(LIBAVL): $(OBJS)
-	$(LINK_LIB)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-	$(RM) $(LIBAVL)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
diff --git a/ldap/nsdeps.mk b/ldap/nsdeps.mk
deleted file mode 100644
index 87372fe4..00000000
--- a/ldap/nsdeps.mk
+++ /dev/null
@@ -1,91 +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
-#
-#
-#  build dependency lists if necessary, then make 'build.mk'
-#
-#  only build dependency lists on platforms that it works on...
-#
-
-
-ifeq ($(ARCH), WINNT)
-# windows can't make dot-files:
-DEPFILE = ./deps
-$(OBJDIR)/mkdep: $(LDAP_SRC)/servers/slapd/tools/mkdep.c
-	$(CC) /Ox /DWINNT /Fe$(OBJDIR)/mkdep.exe \
-		$(LDAP_SRC)/servers/slapd/tools/mkdep.c
-else
-DEPFILE = ./.deps
-$(OBJDIR)/mkdep: $(LDAP_SRC)/servers/slapd/tools/mkdep.c
-	$(CC) -o $(OBJDIR)/mkdep $(LDAP_SRC)/servers/slapd/tools/mkdep.c
-endif
-
-ifeq ($(RECURSIVE_DEP), yes)
-$(DEPFILE): *.h *.c
-	@echo Cant seem to create $(DEPFILE), time to die.
-	@exit 1
-else
-$(DEPFILE): *.h *.c
-	@echo Rebuilding dependency lists...
-	$(OBJDIR)/mkdep -o $(OBJDEST) *.h *.c >$(DEPFILE)
-	$(MAKE) RECURSIVE_DEP=yes
-endif
-
-#
-# you can override these from the command line
-#
-ifeq ($(ARCH), SOLARIS)
-USE_DEPS = no
-endif
-ifeq ($(ARCH), Linux)
-USE_DEPS = no
-endif
-ifeq ($(ARCH), WINNT)
-USE_DEPS = no
-endif
-
-
-# automatic dependency checking?
-ifeq ($(USE_DEPS), yes)
-  ifeq ($(RECURSIVE_DEP), yes)
-    include $(DEPFILE)
-  else
-    BUILD_DEP = $(OBJDIR)/mkdep $(DEPFILE)
-  endif
-endif
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
deleted file mode 100644
index a5b7b7b7..00000000
--- a/ldap/nsldap.mk
+++ /dev/null
@@ -1,1819 +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
-#
-#
-# nsldap.mk: GNU Makefile for common defs used in Fedora Directory Server 
-#	and related tools.
-# 									
-
-#
-# Set the global directory points
-#
-
-# This stuff is for UNIX--we wire in absolute paths
-# because it makes the tar'ing easier.
-# On NT we don't bother with this trick.
-# Note that we're setting BUILD_ROOT again,
-# having set it to a relative path above, so
-# we can find the include files.
-ifneq ($(ARCH), WINNT)
-# This seems useless to check for a path of the form word:word if the arch
-# is neq winnt . . .
-BUILD_TMP = $(subst :, , $(shell cd ../../..;pwd))
-BUILD_WORDS = $(words $(BUILD_TMP))
-# convert BUILD_ROOT from relative path to absolute
-#BUILD_ROOT = $(word $(BUILD_WORDS), $(BUILD_TMP))
-ifneq ($(BUILD_WORDS), 1)
-BUILD_DRIVE = $(word 1, $(BUILD_TMP)):
-endif
-endif
-
-RELTOP=$(BUILD_ROOT)/built/release
-OBJDIR_BASE = $(notdir $(OBJDIR))
-OBJDIR_BASE_32 = $(notdir $(OBJDIR_32))
-# Release directory for Directory Server
-RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE)
-RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE_32)
-RELDIR_UNSTRIP = $(RELDIR)-unstripped
-
-# FHS install paths
-CORE_BINDIR := /usr/bin
-CORE_LIBDIR := /usr/lib
-CORE_DATADIR := /usr/share
-CORE_DOCDIR := /usr/doc
-CORE_SYSCONFDIR := /etc
-DS_ETCDIR := $(CORE_SYSCONFDIR)/$(DS_BRAND)-ds
-DS_LIBDIR := $(CORE_LIBDIR)/$(DS_BRAND)-ds
-DS_DOCDIR := $(CORE_DOCDIR)/$(DS_BRAND)-ds
-DS_PLUGINDIR := $(CORE_DATADIR)/$(DS_BRAND)-ds/plugins
-DS_DATADIR := $(CORE_DATADIR)/$(DS_BRAND)-ds
-DS_LDIFDIR := $(DS_DATADIR)/data
-DS_PROPERTYDIR := $(DS_ETCDIR)/property
-# WILL GO AWAY ???
-DS_JAVADIR := $(CORE_DATADIR)/java
-# WILL GO AWAY ???
-DS_CONSOLEDIR := $(DS_JAVADIR)/$(DS_BRAND)-directoryconsole
-# WILL GO AWAY ???
-DS_DSGWDIR := $(DS_LIBDIR)/dsgw
-# WILL GO AWAY ???
-DS_DSMLGWDIR := $(DS_JAVADIR)/dsmlgw
-DS_SCHEMADIR := $(DS_ETCDIR)/schema
-DS_CONFIGDIR := $(DS_ETCDIR)/config
-DS_LEGACYSCHEMADIR := $(CORE_DATADIR)/$(DS_BRAND)-ds/legacy-schema
-
-# Release path definitions for software components
-# This is the base path for directory server specific components
-LDAP_BASE_RELDIR = $(RELDIR)/bin/slapd
-# This is the base path for the slapd program and other related programs
-LDAP_SERVER_RELDIR = $(RELDIR)$(DS_LIBDIR)
-# This is the path for administrative programs, installers, CGIs, etc.
-LDAP_ADMIN_BIN_RELDIR = $(RELDIR)$(DS_LIBDIR)
-# This is the path for other programs, perf counters, etc.
-LDAP_INSTALL_BIN_RELDIR = $(LDAP_BASE_RELDIR)/install/bin
-# This is the base path for directory server specific dlls
-LDAP_LIB_RELDIR = $(RELDIR)$(DS_LIBDIR)
-# Plugin location
-LDAP_PLUGIN_RELDIR = $(RELDIR)$(DS_LIBDIR)/plugins
-# This is the primary location for the dsadmin dll
-LDAP_ADMDLLDIR = $(LDAP_LIB_RELDIR)
-# This is the location for the dsadmin export and/or static library,
-# for those platforms which separate them from the dll (like NT :-( )
-ifeq ($(ARCH), WINNT)
-LDAP_ADMLIBDIR = $(LDAP_ADMROOT)/lib
-# This is a list of other files (for NT) the dsadmin dll needs to be
-# copied to
-LDAP_ADMDLL_RELDLLS = $(LDAP_ADMIN_BIN_RELDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX) $(LDAP_SERVER_RELDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX)
-LDAP_ADMDLL_RELDIRS = $(LDAP_ADMIN_BIN_RELDIR) $(LDAP_SERVER_RELDIR)
-else # same place as dll
-LDAP_ADMLIBDIR = $(LDAP_ADMDLLDIR)
-endif
-
-LDAP_SRC = $(BUILD_ROOT)/ldap
-
-LDAP_INSTROOT= $(OBJDIR)
-
-LDAP_LIBDIR = $(LDAP_INSTROOT)/lib
-LDAP_OBJDIR = $(LDAP_INSTROOT)/servers/obj
-LDAP_MANDIR = $(LDAP_INSTROOT)/man
-LDAP_BINDIR = $(LDAP_INSTROOT)/bin
-LDAP_INCLUDEDIR = $(LDAP_INSTROOT)/include
-LDAP_ETCDIR = $(LDAP_INSTROOT)/etc
-
-LDAP_ADMROOT = $(LDAP_INSTROOT)/dsadmin
-LDAP_ADMINCDIR = $(LDAP_ADMROOT)/include
-LDAP_ADMOBJDIR = $(LDAP_ADMROOT)/obj
-LDAP_ADMPERLDIR = $(LDAP_ADMROOT)/perl
-
-LDAP_HDIR = $(LDAP_SRC)/include
-
-# set up a target for all directories which are used as dependencies so that the
-# directory will be created if it is needed
-DEPENDENCY_DIRS = $(RELDIR) $(LDAP_SERVER_RELDIR) \
-	$(LDAP_ADMROOT)/lib $(OBJDIR) $(LDAP_LIBDIR) $(LDAP_OBJDIR) \
-	$(LDAP_MANDIR) $(LDAP_BINDIR) $(LDAP_INCLUDEDIR) $(LDAP_ETCDIR) \
-	$(LDAP_ADMINCDIR) $(LDAP_ADMOBJDIR) $(LDAP_ADMPERLDIR) \
-	$(LDAP_PLUGIN_RELDIR) $(LDAP_INSTALL_BIN_RELDIR)
-
-$(DEPENDENCY_DIRS):
-	$(MKDIR) $@
-
-# On AIX, include _shr in shared library names.  This
-# is done because the suffix .a is used with both static and dynamic libs
-# and we need some way to distinguish the two.  You gotta love AIX....
-ifeq ($(ARCH), AIX)
-ifdef OLD_AIX_LINKING
-DLL_PRESUFFIX=_shr
-endif
-else
-DLL_PRESUFFIX=
-endif
-
-# warnings as errors
-# FIXME
-#ifeq ($(ARCH), Linux)
-#CFLAGS += -Werror
-#endif
-#ifeq ($(ARCH), SOLARIS)
-#CFLAGS += -xwe
-#endif
-
-#
-# Dynamic library for LDAP Server Admin interface
-#
-ifeq ($(ARCH), WINNT)
-LDAP_ADMLIB_DEP = $(LDAP_ADMDLLDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX) $(LDAP_ADMLIBDIR)/libds_admin.$(LIB_SUFFIX)
-LDAP_ADMLIB = $(LDAP_ADMLIBDIR)/libds_admin.$(LIB_SUFFIX)
-else
-LDAP_ADMLIB_DEP = $(LDAP_ADMLIBDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX)
-ifeq ($(ARCH), UnixWare)
-#add (COMMON_OBJDIR) to (LDAP_ADMLIB) so $(LD) can find ns-dshttpd.so
-LDAP_ADMLIB = -L$(COMMON_OBJDIR) -lds_admin$(DLL_PRESUF)
-else
-LDAP_ADMLIB = -L$(LDAP_ADMDLLDIR) -lds_admin$(DLL_PRESUF)
-endif # UnixWare
-endif # WINNT
-
-#
-# Common LDAP static libraries.
-# 
-ifdef LDAP_USE_OLD_DB
-ldap_extra_db_lib:=libldbm libdb
-ldap_extra_db_link:=-lldbm -ldb
-else
-ldap_extra_db_lib:=
-ldap_extra_db_link:=
-endif # LDAP_USE_OLD_DB
-LDAP_COMMON_LIBSLIST = libavl $(ldap_extra_db_lib) libldif liblitekey
-ifeq ($(ARCH), WINNT)
-LDAP_COMMON_LIBSLIST += libutil
-else
-LDAP_COMMON_LIBSLIST += libldif
-endif # WINNT
-
-LDAP_COMMON_LIBS_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, $(LDAP_COMMON_LIBSLIST)))
-ifeq ($(ARCH), WINNT)
-LDAP_COMMON_LIBS = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, $(LDAP_COMMON_LIBSLIST)))
-LDAP_COMMON_LINK = /LIBPATH:$(LDAP_LIBDIR) \
-	$(addsuffix .$(LIB_SUFFIX), $(LDAP_COMMON_LIBSLIST))
-else
-LDAP_COMMON_LIBS = -lavl $(ldap_extra_db_link) -lldif
-LDAP_COMMON_LINK = $(LDAP_COMMON_LIBS)
-endif
-
-#
-# Individual LDAP libraries and dependancies
-#
-
-LDAP_LIBAVL_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libavl))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBAVL = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libavl))
-else
-LDAP_LIBAVL = -lavl
-endif
-
-ifdef LDAP_USE_OLD_DB
-LDAP_LIBLDBM_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldbm))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBLDBM = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldbm))
-else
-LDAP_LIBLDBM = -lldbm
-endif
-else
-LDAP_LIBLDBM_DEP:=
-LDAP_LIBLDBM:=
-endif
-
-# dboreham: changed for new db regime
-ifdef LDAP_USE_OLD_DB
-LDAP_LIBDB_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libdb))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBDB = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libdb))
-else
-LDAP_LIBDB = -ldb
-endif
-else
-LDAP_LIBDB_DEP:=
-LDAP_LIBDB:=DONT USE THIS ANYMORE
-endif
-
-LDAP_LIBLBER_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, liblber))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBLBER = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, liblber))
-else
-LDAP_LIBLBER = -llber
-endif
-
-LDAP_LIBUTIL_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libutil))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBUTIL = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libutil))
-else
-LDAP_LIBUTIL = -lutil
-endif
-
-LDAP_LIBLDIF_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldif))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBLDIF = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldif))
-else
-LDAP_LIBLDIF = -lldif
-endif
-
-LDAP_LIBLITEKEY_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, liblitekey))
-ifeq ($(ARCH), WINNT)
-LDAP_LIBLITEKEY = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, liblitekey))
-else
-LDAP_LIBLITEKEY = -llitekey
-endif
-
-ifneq ($(LDAP_NO_LIBLCACHE),1)
-LDAP_SLIBLCACHE_DEP = $(addsuffix .$(LIB_SUFFIX), \
-      $(addprefix $(LDAP_LIBDIR)/, $(LIBLCACHE_LIB)))
-ifeq ($(ARCH), WINNT)
-LDAP_SLIBLCACHE = $(addsuffix .$(LIB_SUFFIX), \
-      $(addprefix $(LDAP_LIBDIR)/, $(LIBLCACHE_LIB)))
-else
-# XXXmcs: on UNIX we actually use the DLL (?)
-LDAP_SLIBLCACHE = $(LDAP_SDK_LIBLCACHE_DLL)
-endif
-endif
-
-# dynamic libs that we ship will be put in <reldir>/lib and
-# static libs that we use to build other ds components will
-# be put in <builddir>/lib; this is mostly for NT and other
-# platforms that separate the static and dynamic code
-ifeq ($(ARCH), WINNT)
-LDAP_LIBBACK_LDBM_LIBDIR = $(LDAP_LIB_RELDIR)
-LDAP_LIBBACK_LDBM_DLLDIR = $(LDAP_LIB_RELDIR)
-LDAP_LIBBACK_LDBM = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, $(LIBBACK_LDBM_LIB)))
-else
-LDAP_LIBBACK_LDBM = -lback-ldbm
-LDAP_LIBBACK_LDBM_LIBDIR = $(LDAP_LIB_RELDIR)
-LDAP_LIBBACK_LDBM_DLLDIR = $(LDAP_LIB_RELDIR)
-endif
-LDAP_LIBBACK_LDBM_DEP = $(addsuffix .$(DLL_SUFFIX), \
-    $(addprefix $(LDAP_LIBBACK_LDBM_LIBDIR)/, $(LIBBACK_LDBM_DLL)))
-
-#
-# Libldapu
-#
-LIBLDAPU_DEP = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldapu))
-ifeq ($(ARCH), WINNT)
-LIBLDAPU = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libldapu))
-else
-LIBLDAPU = -lldapu
-endif
-
-#
-# Libadmin
-#
-LIBADMIN_DEP_OLD = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libadmin))
-ifeq ($(ARCH), WINNT)
-LIBADMIN_OLD = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libadmin))
-else
-LIBADMIN_OLD = -ladmin
-endif
-
-LIBADMIN=$(LIBADMIN_OLD)
-LIBADMIN_DEP=$(LIBADMIN_DEP_OLD)
-
-#
-# Shared library for slapd objects---this contains
-# everything prototyped in backendext.h, and 
-# in slapd-proto.h The latter routines are not
-# for public consumption, but live in the library
-# used by 3rd party backends.
-# On NT, the libslapd dll is packaged in the same directory as the server
-# On Unix, the libslapd dll is packaged in the <server root>/lib directory
-ifeq ($(ARCH), WINNT)
-LIBSLAPD_DEP = $(addsuffix .$(DLL_SUFFIX), \
-    $(addprefix $(LDAP_SERVER_RELDIR)/, libslapd$(DLL_PRESUFFIX)))
-LIBSLAPD_DLL = $(addsuffix .$(DLL_SUFFIX), \
-    $(addprefix $(LDAP_SERVER_RELDIR)/, libslapd$(DLL_PRESUFFIX)))
-LIBSLAPD = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, libslapd))
-LIBSLAPDLINK = /LIBPATH:$(LDAP_LIBDIR) libslapd.$(LIB_SUFFIX)
-# This is a list of other files (for NT) the dsadmin dll needs to be
-# copied to
-LIBSLAPD_RELDLLS = $(LDAP_SERVER_RELDIR)/libslapd$(DLL_PRESUF).$(DLL_SUFFIX)
-LIBSLAPD_RELDIRS = $(LDAP_SERVER_RELDIR)
-else
-# libslapd is now in $(RELDIR)/bin/slapd/server
-LIBSLAPD_DEP = $(addsuffix .$(DLL_SUFFIX), \
-    $(addprefix $(LDAP_SERVER_RELDIR)/, libslapd$(DLL_PRESUFFIX)))
-LIBSLAPD_DLL = $(LIBSLAPD_DEP)
-LIBSLAPD = -L$(LDAP_SERVER_RELDIR) -lslapd$(DLL_PRESUFFIX)
-LIBSLAPDLINK = $(LIBSLAPD)
-endif
-
-#
-# XP
-#
-LIBXP_DEP = $(NSCP_DISTDIR)/lib/libxp.$(LIB_SUFFIX)
-ifeq ($(ARCH), WINNT)
-LIBXP = $(NSCP_DISTDIR)/lib/libxp.$(LIB_SUFFIX)
-else
-LIBXP = -lxp
-endif
-
-#
-# SSLIO
-#
-LIBSSLIO_DEP = $(NSCP_DISTDIR)/lib/libsslio.$(LIB_SUFFIX)
-ifeq ($(ARCH), WINNT)
-LIBSSLIO = $(NSCP_DISTDIR)/lib/libsslio.$(LIB_SUFFIX)
-else
-LIBSSLIO = -lsslio
-endif
-
-#
-# Libsec
-#
-LIBSEC_DEP = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
-LIBSEC = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
-
-#
-# Libdb
-#
-LIBDB_DEP = $(NSCP_DISTDIR)/lib/libdbm.$(LIB_SUFFIX)
-ifeq ($(ARCH), WINNT)
-LIBDB = $(NSCP_DISTDIR)/lib/libdbm.$(LIB_SUFFIX)
-else
-LIBDB = -ldbm
-endif
-
-#
-# ACL library, Libaccess
-#
-LIBACCESS_DEP = $(LDAP_LIBDIR)/libaccess.$(LIB_SUFFIX)
-ifeq ($(ARCH), WINNT)
-LIBACCESS = $(LDAP_LIBDIR)/libaccess.lib
-else
-LIBACCESS = -laccess
-endif
-
-#
-# Dynamic libraries and dependancies, LDAP SDK
-#
-ifeq ($(ARCH), WINNT)
-LIBLDAP_DLL = nsldap32v$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBLDAP_LIB = nsldaps32v$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBSSLDAP_LIB = nsldapssl32v$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBLCACHE_DLL = nslch32v$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBLCACHE_LIB = nslchs32v$(DIRSDK_VERSION_DLL_SUFFIX)
-else
-LIBLDAP_DLL = libldap$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-LIBLCACHE_DLL = liblcache$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-LIBLCACHE_LIB = liblcache$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBLDAP_LIB = libldap$(DIRSDK_VERSION_DLL_SUFFIX)
-LIBSSLDAP_LIB = libssldap$(DIRSDK_VERSION_DLL_SUFFIX)
-endif
-
-ifdef PRODUCT_IS_DIRECTORY_SERVER
-# Get headers and libs from components directory
-  LDAP_SDK_LIBLDAP_DLL_DEP	= $(addsuffix .$(DLL_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBLDAP_DLL)))
-
-  ifeq ($(ARCH), WINNT)
-    LDAP_SDK_LIBLDAP_DLL	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBLDAP_DLL)))
-  else
-    LDAP_SDK_LIBLDAP_DLL	= -lldap$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-  endif
-
-  LDAP_SDK_LIBSSLDAP_LIB_DEP	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBSSLDAP_LIB)))
-
-  LDAP_SDK_LIBSSLDAP_LIB	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBSSLDAP_LIB)))
-
-  ifneq ($(LDAP_NO_LIBLCACHE),1)
-    LDAP_SDK_LIBLCACHE_DLL_DEP	= $(addsuffix .$(DLL_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBLCACHE_DLL)))
-
-    ifeq ($(ARCH), WINNT)
-      LDAP_SDK_LIBLCACHE_DLL	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBPATH)/, $(LIBLCACHE_DLL)))
-    else
-        LDAP_SDK_LIBLCACHE_DLL	= -llcache$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-    endif
-  endif
-else
-# Client SDK
-  LDAP_SDK_LIBLDAP_DLL_DEP	= $(addsuffix .$(DLL_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBLDAP_DLL)))
-
-  ifeq ($(ARCH), WINNT)
-    LDAP_SDK_LIBLDAP_DLL	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBLDAP_DLL)))
-  else
-    LDAP_SDK_LIBLDAP_DLL	= -lldap$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-  endif
-
-  LDAP_SDK_LIBSSLDAP_LIB_DEP	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBSSLDAP_LIB)))
-
-  LDAP_SDK_LIBSSLDAP_LIB	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBSSLDAP_LIB)))
-
-  ifneq ($(LDAP_NO_LIBLCACHE),1)
-    LDAP_SDK_LIBLCACHE_DLL_DEP	= $(addsuffix .$(DLL_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBLCACHE_DLL)))
-
-    ifeq ($(ARCH), WINNT)
-      LDAP_SDK_LIBLCACHE_DLL	= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(LDAP_LIBDIR)/, $(LIBLCACHE_DLL)))
-    else
-        LDAP_SDK_LIBLCACHE_DLL	= -llcache$(DIRSDK_VERSION_DLL_SUFFIX)$(DLL_PRESUFFIX)
-    endif
-  endif
-endif
-
-#dboreham: removed LIBLCACHE from the following lines---everybody was
-#linking with liblcache, which isn't right.
-LDAP_SDK_LIBS_DEP	= $(LDAP_SDK_LIBSSLDAP_LIB_DEP) \
-    $(LDAP_SDK_LIBLDAP_DLL_DEP)
-
-LDAP_SDK_LIBS	= $(LDAP_SDK_LIBSSLDAP_LIB) $(LDAP_SDK_LIBLDAP_DLL)
-
-#
-# Dynamic and static libraries, BACK-LDBM 
-#
-ifeq ($(ARCH), WINNT)
-LIBBACK_LDBM_DLL = libback-ldbm
-LIBBACK_LDBM_LIB = libback-ldbms
-else
-LIBBACK_LDBM_DLL = libback-ldbm$(DLL_PRESUFFIX)
-LIBBACK_LDBM_LIB = libback-ldbm
-endif
-
-#
-# Dynamic library, BACK-LDIF
-#
-#ifeq ($(ARCH), WINNT)
-LIBBACK_LDIF_DLL = libback-ldif
-#else
-LIBBACK_LDIF_DLL = libback-ldif$(DLL_PRESUFFIX)
-#endif
-
-#
-# Dynamic library, REFERINT
-#
-ifeq ($(ARCH), WINNT)
-REFERINT_DLL = referint-plugin
-else
-REFERINT_DLL = libreferint-plugin$(DLL_PRESUFFIX)
-endif
-
-#
-# Dynamic library, SYNTAX
-#
-ifeq ($(ARCH), WINNT)
-SYNTAX_DLL = syntax-plugin
-else
-SYNTAX_DLL = libsyntax-plugin$(DLL_PRESUFFIX)
-endif
-
-#
-# Dynamic library, COLLATION
-#
-COLLATION_DLL=libcollation-plugin$(DLL_PRESUFFIX)
-
-#
-# Dynamic library, NT Synchronization Service plugin
-#
-NTSYNCH_DLL=libntsynch-plugin$(DLL_PRESUFFIX)
-
-#
-# Dynamic library, PASS THROUGH AUTHENTICATION PLUGIN
-#
-PASSTHRU_DLL = libpassthru-plugin$(DLL_PRESUFFIX)
-
-#
-# Dynamic library, PAM PASS THROUGH AUTHENTICATION PLUGIN
-#
-PAM_PASSTHRU_DLL = libpam-passthru-plugin$(DLL_PRESUFFIX)
-
-#
-# Dynamic library, UNIQUE UID CHECKING PLUGIN
-#
-UID_DLL = libattr-unique-plugin$(DLL_RESUFFIX)
-
-# Dynamic library, Replication Plugin
-#
-REPLICATION_DLL = libreplication-plugin$(DLL_RESUFFIX)
-
-RETROCL_DLL = libretrocl-plugin$(DLL_RESUFFIX)
-
-#
-# Dynamic library, ACL PLUGIN
-#
-ACL_DLL = libacl-plugin$(DLL_RESUFFIX)
-
-#
-# Dynamic library, TEST-PLUGINS
-#
-ifeq ($(ARCH), WINNT)
-TEST_PLUGIN_DLL = ns-test-plugin
-else
-TEST_PLUGIN_DLL = libtest-plugin
-endif
-
-#
-# Dynamic library, PWDSTORAGE
-#
-ifeq ($(ARCH), WINNT)
-PWD_DLL = pwdstorage-plugin
-else
-PWD_DLL = libpwdstorage-plugin$(DLL_PRESUFFIX)
-endif
-
-#
-# Dynamic library, DISTRIBUTION EXAMPLE
-#
-ifeq ($(ARCH), WINNT)
-DIS_DLL = distrib-plugin
-else
-DIS_DLL = libdistrib-plugin$(DLL_PRESUFFIX)
-endif
-
-#
-# Chaining backend library, CHAINING DATABASE PLUGIN
-#
-CB_DLL = libchainingdb-plugin$(DLL_PRESUFFIX)
-
-#
-# Admin server dynamic library location.
-#
-ifeq ($(BUILD_MODULE), HTTP_ADMIN)
-ADMININCLUDEDIR = $(BUILD_ROOT)/include
-endif
-
-ifeq ($(ARCH), AIX)
-ADMSONAME=ns-admin$(DLL_PRESUFFIX).$(DLL_SUFFIX)
-else
-ifeq ($(ARCH), WINNT)
-ADMSONAME=ns-admin.$(LIB_SUFFIX)
-endif # WINNT
-endif # AIX
-
-ifndef ADMSONAME
-ADMSONAME=ns-admin.$(DLL_SUFFIX)
-endif
-
-ifndef ADMSOLIB
-ADMSOLIB = $(BASIC_OBJDIR)-admin/$(ADMSONAME)
-endif
-
-#
-# Library path
-#
-ifeq ($(ARCH), WINNT)
-LIBPATH=LIBPATH:
-else
-LIBPATH=L
-endif
-
-#
-# Web server dynamic library.
-#
-ifeq ($(ARCH), WINNT)
-
-NSHTTPD_DEP =	$(COMMON_OBJDIR)/$(BUILD_HTTPDLL_NAME).$(LIB_SUFFIX)
-NSHTTPD =	/LIBPATH:$(COMMON_OBJDIR) $(BUILD_HTTPDLL_NAME).$(LIB_SUFFIX)
-DYN_NSHTTPD=$(NSHTTPD)
-NSHTTPD_DLL=$(BUILD_HTTPDLL_NAME)
-
-else
-
-NSHTTPD=$(COMMON_OBJDIR)/$(BUILD_HTTPDLL_NAME).$(DLL_SUFFIX)
-NSHTTPD_DEP = $(NSHTTPD)
-DYN_NSHTTPD=-L$(COMMON_OBJDIR) -l$(LINK_HTTPDLL_NAME)
-NSHTTPD_DLL=$(BUILD_HTTPDLL_NAME)
-
-ifeq ($(ARCH), SOLARIS)
-
-DLLEXPORTS_PREFIX=-Blocal -M
-
-else
-ifeq ($(ARCH), SOLARISx86)
-
-DLLEXPORTS_PREFIX=-Blocal -M
-
-else
-ifeq ($(ARCH), IRIX)
-
-DLLEXPORTS_PREFIX=-exports_file 
-
-else
-ifeq ($(ARCH),HPUX)
-
-else 
-ifeq ($(ARCH),AIX)
-
-NSHTTPD = $(COMMON_OBJDIR)/$(BUILD_HTTPDLL_NAME)$(DLL_PRESUF).$(DLL_SUFFIX)
-DLLEXPORTS_PREFIX=-bE:
-ifdef OLD_AIX_LINKING
-	DL=-lsvld
-else
-	DL=-ldl
-# flags added to every link
-	PLATFORMLDFLAGS = -brtl
-endif
-
-else
-ifeq ($(ARCH),OSF1)
-
-DL=
-
-else
-ifeq ($(ARCH), Linux)
-
-DL=-ldl
-
-else
-ifeq ($(ARCH),ReliantUNIX)
-
-DYN_NSHTTPD=$(NSHTTPD)
-DL=-ldl
-
-else
-ifeq ($(ARCH),UnixWare)
-
-DYN_NSHTTPD=$(NSHTTPD)
-DL=
-
-else
-#the previous default
-#NSHTTPD=$(NSCP_DISTDIR)/lib/$(BUILD_HTTPDLL_NAME).$(DLL_SUFFIX)
-#DYN_NSHTTPD=$(NSHTTPD)
-#DL=-ldl
-#
-#the new default, which is much better when it comes to porting this product
-NSHTTPD="you need to edit ldap/nsldap.mk for $(ARCH)"
-DYN_NSHTTPD="you need to edit ldap/nsldap.mk for $(ARCH)"
-endif # UnixWare
-endif # ReliantUNIX
-endif # Linux
-endif # OSF1
-endif # AIX
-endif # HPUX
-endif # IRIX
-endif # SOLARISx86
-endif # SOLARIS
-endif # WINNT
-
-
-ADMIN_SECGLUEOBJ=$(BASIC_OBJDIR)-admin/admin-lib/secglue.o
-
-SECGLUEOBJ=$(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)/httpd-lib/secglue.o
-# XXXggood need to pick up the /share/builds versions of the shared libs
-# because ones we build here don't appear to be compatible with existing
-# shared libs, which are used by admin server.
-#SDKROOT = /share/builds/components/ldapsdk/19961107-bad/$(NC_BUILD_FLAVOR)
-#SDKLDIR = $(SDKROOT)/lib
-#SDKROOT = /share/builds/components/ldapsdk/latest/$(NC_BUILD_FLAVOR)
-#SDKLDIR = $(SDKROOT)/lib
-SDKROOT = $(OBJDIR)
-SDKLDIR = $(SDKROOT)/lib
-SDKHDIR = $(SDKROOT)/include
-LDB_HDIR = $(LDAP_SRC)/libraries/berkeley_db/PORT/include
-
-#
-# Compiler symbol definition 
-#
-LDAP_REFERRALS=-DLDAP_REFERRALS
-SLAPD_BACKENDS=-DLDAP_LDBM -DLDAP_LDIF
-LDBMBACKEND=-DLDBM_USE_DBBTREE
-SLAPD_PASSWD_HASH=-DSLAPD_PASSWD_SHA1
-# all debug and server builds are done with LDAP_DEBUG defined.
-# SDK builds pass LDAP_NO_LDAPDEBUG=1 which causes us not to define
-# LDAP_DEBUG in optimized builds.
-ifneq ($(BUILD_DEBUG), optimize)
-LDAP_DEBUG=-DLDAP_DEBUG
-else
-ifneq ($(LDAP_NO_LDAPDEBUG),1)
-LDAP_DEBUG=-DLDAP_DEBUG
-endif
-endif
-NEEDPROTOS=-DNEEDPROTOS
-WINSOCK=-DWINSOCK
-USE_LOCKF=-DUSE_LOCKF
-LDAP_SSLIO_HOOKS=-DLDAP_SSLIO_HOOKS
-DBINTERFACE_PRIVATE=-D__DBINTERFACE_PRIVATE
-NO_DOMAINNAME=-DNO_DOMAINNAME
-
-ifeq ($(LDAP_NO_LIBLCACHE),1)
-NO_LIBLCACHE=-DNO_LIBLCACHE
-endif
-
-ifeq ($(BUILD_MODULE), DIRECTORY)
-NS_DIRECTORY=-DNS_DIRECTORY
-endif
-
-# uncomment this line to use soundex for approximate matches in slapd.
-# the default is to use the metaphone algorithm.
-#PHONETIC=-DSOUNDEX
-
-#
-# uncomment for LDAP over UDP
-#CLDAP=-DCLDAP
-
-#
-# uncomment for Universty of Michigan specific things.
-#UOFM=-DUOFM
-
-#
-# uncomment for elimination of local caching support in Libldap
-#NO_CACHE=-DNO_CACHE
-
-#
-# If you don't want to do auto-translation of character sets, skip this.
-#
-# Otherwise, uncomment this line and set the following options.
-#STR_TRANSLATION=-DSTR_TRANSLATION
-#
-# remove the defines for LDAP client library T.61 character translation
-# you do not need.  If you use LDAP_CHARSET_8859, replace the '1' in "88591"
-# with the number of the particular character set you use.  E.g., use "88594"
-# if you use the ISO 8859-4 chracter set.
-#LIBLDAP_CHARSETS=-DLDAP_CHARSET_8859="88591"
-#
-# uncomment one these lines to enable automatic T.61 translation by default
-#LIBLDAP_DEF_CHARSET=-DLDAP_DEFAULT_CHARSET=LDAP_CHARSET_8859
-
-#
-# If you are NOT using Kerberos authentication, you can skip this section.
-#
-# Otherwise, to enable kerberos authentication, uncomment KERBEROS (and
-# AFSKERBEROS if you are running the AFS version of kerberos).  Also
-# uncomment and change the various KRB* lines to point to where the
-# kerberos libraries and include files are installed at your site.
-#
-#KERBEROS=-DKERBEROS
-#AFSKERBEROS=-DAFSKERBEROS
-#KRBINCLUDEFLAG = -I/usr/local/kerberos/include
-#KRBLIBFLAG = -L/usr/local/kerberos/lib
-#KRBLIBS        = -lkrb -ldes
-
-# General non-Windows compiler options
-#
-# Passed to every compile (cc or gcc).  This is where you put -O or -g, etc.
-ifneq ($(ARCH), WINNT)
-ifdef BUILD_OPT
-ifeq ($(ARCH) $(NSOS_RELEASE), HPUX B.11.23)
-EXTRACFLAGS=+O3
-else
-EXTRACFLAGS=-O
-endif
-else
-EXTRACFLAGS=-g
-endif
-endif
-
-ifeq ($(ARCH), WINNT)
-ifeq ($(DEBUG), full)
-DSLDDEBUG=/debug
-else
-ifeq ($(DEBUG), purify)
-DSLDDEBUG=/debug
-endif
-endif
-ifndef HEAPAGENT
-PDBOPT=/PDB:NONE
-endif
-endif
-
-#
-# SSL-related definitions
-#
-ifeq ($(SECURITY), export)
-SECURITY_EXTN=export
-endif
-ifeq ($(SECURITY), domestic)
-SECURITY_EXTN=us
-endif
-
-SSL = -DUSE_NSPR_MT
-EXTRASSLLIBS = $(LIBARES)
-
-ifeq ($(ARCH), WINNT)
-SSLLIBS = $(EXTRASSLLIBS)
-endif
-
-ifeq ($(ARCH), WINNT)
-LIBNT = $(OBJDIR)/libnt.lib
-LIBNT_DEP = $(LIBNT)
-endif
-
-# If you are certain that an executable will not be using libsec, include
-# the following early in the link command.  secglue.o includes "do nothing"
-# shims for most libsec functions.  We do this to reduce our size.
-ifeq ($(ARCH), WINNT)
-# MLM
-# SECGLUE= ns-admin.lib
-SECGLUE = $(NSHTTPD) $(OSDEPLIBS) $(LIBNT)
-NOSSLLIBS = $(LDAP_LIBDIR)/libldap.lib \
-	    $(SSLLIBS) $(ALIBS) 
-else
-# $(ARCH) != WINNT
-ifeq ($(ARCH), Linux)
-# XXXsspitzer: all gcc platforms will have to do this
-SECGLUE= $(SECGLUEOBJS) $(DYN_NSHTTPD)
-#                                        $(LIBARES)
-else # Linux
-SECGLUE= $(SECGLUEOBJS) $(DYN_NSHTTPD) 
-#                                        $(LIBARES)
-endif # Linux
-NOSSLLIBS = $(LDAP_SDK_LIBLDAP_DLL) $(LDAP_SDK_LIBLCACHE_DLL)\
-     $(SECGLUE) $(ALIBS)
-endif
-
-ifeq ($(BUILD_DLL), yes)
-STATIC_SECDEPS= $(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(COMMON_OBJDIR)/lib/lib, \
-			    $(LIBADMIN) $(FRAME) $(LIBACCESS) $(CRYPT))) \
-			    $(LIBSEC) $(LIBNSPR)
-
-DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS) 
-DYNAMIC_DEPLINK=$(DYNAMIC_DEPLIBS)
-else
-STATIC_DEPLIBS=$(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(OBJDIR)/lib/lib, \
-			    $(LIBADMIN) $(FRAME) $(LIBACCESS) $(CRYPT))) \
-			    $(LIBNSPR)
-
-STATIC_SECDEPS=$(addsuffix .$(LIB_SUFFIX), \
-			    $(addprefix $(OBJDIR)/lib/lib, \
-			    $(LIBADMIN) $(FRAME) $(LIBACCESS) $(CRYPT))) \
-			    $(LIBSEC) $(LIBNSPR)
-
-DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS)
-DYNAMIC_DEPLINK=$(LDAP_COMMON_LIBS)
-endif
-
-ifndef DEPLIBS
-DEPLIBS = $(DYNAMIC_DEPLIBS)
-DEPLINK = $(DYNAMIC_DEPLINK)
-ifeq ($(ARCH), WINNT)
-SECDEPS = $(DEPLIBS) $(SECGLUE) $(XP_OBJS)
-else
-SECDEPS = $(STATIC_SECDEPS)
-endif
-SECLINK = $(SECDEPS)
-endif
-
-HTMLDEFS=-DPRODUCT_NAME=$(PRODUCT) -D$(ARCH) -DARCH=$(PRETTY_ARCH)
-
-#
-# Windows NT platform-specifics
-#
-ifeq ($(ARCH), WINNT)
-
-PLATFORM_INCLUDE = -I$(BUILD_ROOT)/include/nt \
-    -I$(LDAP_SRC)/libraries/libutil
-
-SYSERRLIST_IN_STDIO=-DSYSERRLIST_IN_STDIO
-
-endif # WINNT
-
-ifeq ($(ARCH), SOLARIS)
-#
-# SunOS5 platform-specifics
-#
-
-PLATFORM=sunos5
-
-# ranlib not needed under SunOS5
-RANLIB	= true
-
-ifdef NS_USE_NATIVE
-# be explicit about which CC to use
-CC=cc -v
-endif
-
-# gie full path to hostname since it may not be in user's path
-HOSTNAME=/usr/ucb/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-ifdef NS_USE_NATIVE
-SLCFLAGS= -KPIC
-else
-SLCFLAGS= -fPIC
-endif
-
-# Extra linker options needed when creating shared libraries
-DYNALIBS=
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-R
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-R
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so
-ifdef NS_USE_NATIVE
-SONAMEFLAG_PREFIX=-h
-endif
-
-THREADS= -DTHREAD_SUNOS5_LWP
-PLAT_ADMCFLAGS=	-DSVR4 -DSOLARIS
-PLAT_ADMLIBS= 
-PLATFORMCFLAGS=	-D$(PLATFORM) -D_REENTRANT -DSVR4
-PLATFORMLIBS= -lresolv -lsocket -lnsl -lgen -ldl -lposix4 -lw
-THREADS= -DTHREAD_SUNOS5_LWP
-THREADSLIB=-lthread
-endif # SOLARIS
-
-ifeq ($(ARCH), SOLARISx86)
-#
-# Solaris x86 platform-specifics
-#
-
-PLATFORM=sunos5x86
-
-# ranlib not needed under sunos5x86
-RANLIB	= true
-
-# be explicit about which CC to use
-CC=cc
-#CC=gcc
-
-# give full path to hostname since it may not be in user's path
-HOSTNAME=/usr/ucb/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-ifeq ($(CC), cc)
-SLCFLAGS= -KPIC
-else
-SLCFLAGS= -fPIC
-endif
-
-# Extra linker options needed when creating shared libraries
-DYNALIBS=
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-R,
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-R
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so
-SONAMEFLAG_PREFIX=-h
-
-THREADS= -DTHREAD_SUNOS5x86_LWP
-PLAT_ADMCFLAGS=	-DSVR4 -DSOLARISx86 -DSOLARIS
-PLAT_ADMLIBS= 
-PLATFORMCFLAGS=	-D$(PLATFORM) -D_REENTRANT -DSVR4
-PLATFORMLIBS= -lresolv -lsocket -lnsl -lgen -ldl -lposix4 -lw
-THREADS= -DTHREAD_SUNOS5x86_LWP
-THREADSLIB=-lthread
-endif # SOLARISx86
-
-ifeq ($(ARCH), SUNOS4)
-#
-# SunOS 4 platform-specifics
-#
-
-5LINT	= /usr/5bin/lint
-
-PLATFORMCFLAGS= -Dsunos4
-THREADS= -DTHREAD_SUNOS4_LWP
-THREADSLIB=-llwp
-
-#
-# the SunOS 4 cc compiler doesn't understand function prototypes, so we
-# need the unproto preprocessor
-#
-NEEDUNPROTO=yes
-UNPROTOCFLAGS=-Qpath $(LDAP_SRC)/build/unproto
-endif # SUNOS4
-
-ifeq ($(ARCH), IRIX)
-#
-# IRIX platform-specifics
-#
-
-PLAT_ADMCFLAGS=	-DSVR4 -DIRIX
-PLAT_ADMLIBS= 
-
-PLATFORM=irix
-# ranlib not needed under IRIX
-RANLIB	= true
-
-# be explicit about which CC to use
-CC=cc
-
-# give full path to hostname since it may not be in user's path
-HOSTNAME=/usr/bsd/hostname
-
-# don't count on a BSD install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-Wl,-rpath,
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-rpath
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so
-# Note that the definition below includes a trailing space.
-SONAMEFLAG_PREFIX=-soname 
-
-PLATFORMCFLAGS=-DUSE_WAITPID -D$(PLATFORM)
-PLATFORMLIBS=
-THREADS= -DTHREAD_SGI_SPROC
-THREADSLIB=
-
-endif # IRIX
-
-ifeq ($(ARCH), OSF1)
-
-#
-# OSF1 platform-specifics
-#
-
-PLATFORM=OSF1
-
-# Even though prototypes are supported by the compiler, OSF's CC doesn't
-# seem to define __STDC__ so we explicitly defined NEEDPROTOS here.
-PLATFORMCFLAGS= -D$(PLATFORM) -DNEEDPROTOS -D_REENTRANT
-PLATFORMLIBS=
-THREADS= -DTHREAD_DCE_PTHREADS
-THREADSLIB= -lpthread
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-Wl,-rpath,
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-rpath
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so
-# Note that the definition below includes a trailing space.
-SONAMEFLAG_PREFIX=-soname 
-
-# the BSD-like install under OSF/1 is called installbsd
-# INSTALL=installbsd
-# use this shell script, instead of installbsd.  
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-endif # OSF1
-
-ifeq ($(ARCH), AIX)
-
-#
-# AIX platform-specifics
-#
-
-PLAT_ADMCFLAGS= -DAIX 
-PLAT_ADMLIBS=
-
-PLATFORM=aix
-
-# ranlib for aix 
-RANLIB=ranlib
-
-# install with BSD semantics
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags to set runtime shared library search path.  For example:
-# $(CC) $(RPATHFLAG_PREFIX)../..$(RPATHFLAG_EXTRAS)
-RPATHFLAG_PREFIX=-blibpath:
-RPATHFLAG_EXTRAS=:/usr/lib:/lib
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-blibpath:/usr/lib:/lib:
-
-PLATFORMCFLAGS=	-D_AIX32_CURSES -DUSE_PTHREADS -DHW_THREADS \
-    -DUSE_REENTRANT_LIBC -Daix -Dunix
-
-PLATFORMLIBS= 
-THREADS= -DTHREAD_AIX_PTHREADS
-#SECGLUE= moresecglue.o \
-#        $(BUILD_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/longlong.o \
-#        $(BUILD_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/prprf.o
-
-# JCM - Use -bnoquiet to find out which symbols can't be resolved.
-DLL_LDFLAGS= -bexpall -brtl -bM:SRE -bnoentry \
-    -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-DLL_EXTRA_LIBS= -bI:/usr/lib/lowsys.exp -lC_r -lC -lpthreads -lc_r -lm \
-    /usr/lib/libc.a
-
-ifdef OLD_AIX_LINKING
-EXE_EXTRA_LIBS= -bI:/usr/lib/syscalls.exp -lsvld -lpthreads 
-else
-EXE_EXTRA_LIBS= -bI:/usr/lib/syscalls.exp -ldl -lpthreads 
-endif
-
-endif # AIX
-
-ifeq ($(ARCH), HPUX)
-#
-# HP-UX platform-specifics
-#
-
-ifeq ($(NSOS_RELEASE), B.11.23)
-# -Ae is removed from PLATFORMCFLAGS, because CC and CXX share
-# same CFLAGS, -AP is added to CXX, and -Ae can not coexist with
-# -AP, so add -Ae to the front of CC
-CC=cc -Ae
-else
-CC=cc
-endif
-PLATFORM=hpux
-
-# ranlib not needed under HP-UX
-RANLIB  = true
-
-# install under HP-UX is not like on BSD systems, so we use our own script
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS=+Z
-
-# we need to link a separate library to get ndbm routines under HP/UX
-LDBMLIB=-lndbm
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-Wl,+s,+b,
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-LDRPATHFLAG_PREFIX=-Wl,+s,+b,
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX) libldap.so
-SONAMEFLAG_PREFIX=-Wl,+h
-
-# we need to link in the V3 library to get sigset()
-# 07/03/02 - no longer needed - version 6.1
-# PLATFORMLIBS= -lV3
-
-# -Ae means 'enforce ansi BUT allow the use of long-long'.  we need this
-# for 64-bit file support.
-ifneq ($(NSOS_RELEASE),B.11.23)
-PLATFORMCFLAGS= -Dhpux -D$(PLATFORM) -D_HPUX_SOURCE -D_REENTRANT -Ae
-else
-PLATFORMCFLAGS= -Dhpux -D$(PLATFORM) -D_HPUX_SOURCE -D_REENTRANT
-THREADSLIB=-lpthread
-endif
-
-#aCC doesn't recognize -Ae so this will be used with aCC
-ACC_PLATFORMCFLAGS= -Dhpux -D$(PLATFORM) -D_HPUX_SOURCE -D_REENTRANT
-
-endif # HPUX
-
-# UNIXWARE || UnixWare
-ifeq ($(subst nix,NIX,$(subst are,ARE,$(ARCH))), UNIXWARE)
-#
-# LDAP SVR4 standard cc Make-platform file
-# Uses the std SVR4 stuff whenever possible.
-# Some references to the BSD compatibility required.
-# "bsdcompat" is an optional package, but we need it installed for other builds
-#
-
-#
-# add any platform-specific overrides below here
-#
-
-# compiler to use, e.g. CC=cc or CC=gcc
-ifndef CC
-CC = cc
-endif
-
-# give full path to hostname since it may not be in user's path
-HOSTNAME=/usr/ucb/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-# INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS= -Kpic
-
-# Flags required to cause linker to create a shared library
-DYNAFLAGS= -G
-
-# Extra linker options needed then creating shared libraries
-DYNALIBS= -ldl
-
-# Filename extension for shared libraries
-DYNAEXT=so
-
-# ndbm library, needed if not in libc (e.g. LDBMLIB=-lndbm)
-LDBMLIB = -L/usr/ucblib -ldbm
-
-# BSD-like install command; if necessary, you can use a script
-INSTALL = /usr/ucb/install
-
-# command to convert libraries for efficient random access;
-RANLIB = true
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX) libldap.so
-SONAMEFLAG_PREFIX=-h
-
-USE_LD_RUN_PATH=true
-
-# other commands  - see the file build/Make-append for a list
-endif #UNIXWARE || UnixWare
-
-ifeq ($(ARCH), UNIXWARE)
-
-PLAT_ADMCFLAGS=  -DUNIXWARE -DSVR4 -DSYSV
-
-# flags added to every compile
-PLATFORMCFLAGS= -DUNIXWARE -DSYSV -DSVR4
-
-# flags added to every link
-PLATFORMLDFLAGS =
-
-# extra libraries needed (added to the end of all link commands)
-PLATFORMLIBS =  -lsocket -lnsl -lresolv -lgen
-
-# other commands  - see the file build/Make-append for a list
-endif #UNIXWARE
-
-ifeq ($(ARCH), UnixWare)
-# Gemini: UnixWare7 (SVR5), or UNIXWARE2.1.x (SVR4) with the UDK
-SYSV_REL := $(shell $(BUILD_ROOT)/nsarch -f | sed 's/UnixWare //')
-ifeq ($(SYSV_REL),5)
-PLAT_ADMCFLAGS= -DUnixWare -DSVR5 -DSYSV
-PLATFORMCFLAGS= -DUnixWare -DSYSV -DSVR5
-else
-PLAT_ADMCFLAGS= -DUNIXWARE -DSVR4 -DSYSV
-PLATFORMCFLAGS= -DUNIXWARE -DSYSV -DSVR4
-endif
-
-# flags added to every link
-PLATFORMLDFLAGS =
-
-# extra libraries needed (added to the end of all link commands)
-PLATFORMLIBS =  -lsocket -lnsl -lresolv -lgen
-
-# other commands  - see the file build/Make-append for a list
-endif #UnixWare
-
-ifeq ($(ARCH), SCOOS)
-#
-# LDAP SVR4 standard cc Make-platform file
-# Uses the std SVR4 stuff whenever possible.
-# Some references to the BSD compatibility required.
-#
-
-#
-# add any platform-specific overrides below here
-#
-
-# ranlib not needed under SCOOS
-RANLIB  = true
-
-USE_LD_RUN_PATH=true
-
-CC= cc -b elf -KPIC -DSCO -DSCOOS
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS= -Kpic
-
-PLATFORMCFLAGS=  -DSCO_SV -DSYSV -DHAVE_STRERROR -DSW_THREADS -DSCO_PM -DSCO -Dsco -DSCOOS
-
-PLATFORMLIBS= -lsocket 
-
-#-lnsl -ldl -lpmapi -lc -lPW
-
-EXTRA_LIBS= -lsocket 
-#-lnsl -ldl -lpmapi -lc -lPW
-
-endif # SCOOS
-
-ifeq ($(ARCH), NCR)
-#
-# LDAP SVR4 standard cc Make-platform file
-# Uses the std SVR4 stuff whenever possible.
-# Some references to the BSD compatibility required.
-#
-
-#
-# add any platform-specific overrides below here
-#
-
-# compiler to use, e.g. CC=cc or CC=gcc
-ifndef CC
-CC = gcc
-endif
-
-# give full path to hostname since it may not be in user's path
-HOSTNAME=/usr/ucb/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS= -fpic
-
-PLAT_ADMCFLAGS=  -DNCR -Di386 -DSVR4 -DSYSV -DHAVE_STRERROR -DSW_THREADS
-
-# flags added to every compile
-PLATFORMCFLAGS=  -DNCR -Di386 -DSVR4 -DSYSV -DHAVE_STRERROR -DSW_THREADS 
-
-# flags added to every link
-PLATFORMLDFLAGS =
-
-# extra libraries needed (added to the end of all link commands)
-PLATFORMLIBS =  -lsocket -lnsl -lgen 
-
-EXTRA_LIBS = -lsocket -lnsl -lgen -ldl -lc /usr/ucblib/libucb.a
-
-# Flags required to cause linker to create a shared library
-DYNAFLAGS= -G
-
-# Extra linker options needed then creating shared libraries
-DYNALIBS= -ldl
-
-# Filename extension for shared libraries
-DYNAEXT=so
-
-# ndbm library, needed if not in libc (e.g. LDBMLIB=-lndbm)
-LDBMLIB = -L/usr/ucblib -ldbm
-
-# command to convert libraries for efficient random access;
-RANLIB = true
-
-USE_LD_RUN_PATH=true
-
-# other commands  - see the file build/Make-append for a list
-endif #NCR
-
-ifeq ($(ARCH), ReliantUNIX)
-#
-# ReliantUNIX platform-specifics
-#
-PLATFORM=reliantunix
-
-# ranlib not needed under ReliantUNIX
-RANLIB  = true
-
-# be explicit about which CC to use
-CC=cc
-
-# gie full path to hostname since it may not be in user's path
-HOSTNAME=/usr/ucb/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS=
-
-# Extra linker options needed when creating shared libraries
-DYNALIBS=
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-Wl,-R,
-USE_LD_RUN_PATH=true
-
-# flag to pass to ld to set a shared library's "internal name"
-# this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so
-SONAMEFLAG_PREFIX=-h
-
-THREADS= -DTHREAD_SUNOS5_LWP
-PLAT_ADMCFLAGS= -DSVR4 -DSNI -DRELIANTUNIX
-PLAT_ADMLIBS=
-PLATFORMCFLAGS= -D$(PLATFORM) -DSVR4 -DSNI -DRELIANTUNIX
-#libc_r.so.1 for strtok_r? talk to ckaiser.  maybe libsni_r.a?
-#right now, check out ns/nspr20/pr/include/md/_reliantunix.cfg and
-#ns/nspr20/pr/src/md/unix/reliantunix.c 
-PLATFORMLIBS= -lresolv -lsocket -lnsl -lgen -ldl
-THREADS=
-THREADSLIB=
-
-endif # ReliantUNIX
-
-ifeq ($(ARCH), Linux)
-#
-# add any platform-specific overrides below here
-#
-
-# compiler to use, e.g. CC=cc or CC=gcc
-CC=/usr/bin/gcc
-
-# give full path to hostname since it may not be in user's path
-HOSTNAME=/bin/hostname
-
-# don't count on /usr/ucb/install being present or first in path
-INSTALL=$(LDAP_SRC)/build/install.sh
-
-# flag to pass to cc when linking to set runtime shared library search path
-# this is used like this, for example:   $(RPATHFLAG_PREFIX)../..
-RPATHFLAG_PREFIX=-Wl,-rpath,
-
-# flag to pass to ld when linking to set runtime shared library search path
-# this is used like this, for example:   $(LDRPATHFLAG_PREFIX)../..
-# note, there is a trailing space
-LDRPATHFLAG_PREFIX=-rpath 
-
-# Flags required to cause compiler to generate code suitable for use in
-# a shared library.
-SLCFLAGS= -fpic
-
-PLAT_ADMCFLAGS=  -DLINUX -DLINUX2_0 -DLINUX2_2 -DLinux
- 
-# flags added to every compile
-PLATFORMCFLAGS=  -DLINUX -DLINUX2_0 -DLINUX2_2 -DLinux
-
-# flags added to every link
-PLATFORMLDFLAGS =
-
-# extra libraries needed (added to the end of all link commands)
-PLATFORMLIBS =  
-
-EXTRA_LIBS = -ldl
-
-# Flags required to cause linker to create a shared library
-DYNAFLAGS= -shared
-
-# Extra linker options needed then creating shared libraries
-DYNALIBS= -ldl
-
-# Filename extension for shared libraries
-DYNAEXT=so
-
-# ndbm library, needed if not in libc (e.g. LDBMLIB=-lndbm)
-LDBMLIB = -L/usr/ucblib -ldbm
-
-# command to convert libraries for efficient random access;
-RANLIB = ranlib
-
-# other commands  - see the file build/Make-append for a list
-endif # Linux
-
-#
-# DEFS are included in CFLAGS
-#
-DEFS	= $(PLATFORMCFLAGS) $(LDAP_DEBUG) $(KERBEROS) $(AFSKERBEROS) \
-	    $(UOFM) $(NO_USERINTERFACE) $(CLDAP) $(NO_CACHE) $(DBDEFS) \
-	    $(LDAP_REFERRALS) $(LDAP_DNS) $(STR_TRANSLATION) \
-	    $(LIBLDAP_CHARSETS) $(LIBLDAP_DEF_CHARSET) \
-	    $(SLAPD_BACKENDS) $(LDBMBACKEND) $(LDBMINCLUDE) $(PHONETIC) \
-	    $(SLAPD_PASSWD_HASH) $(LDAP_SSLIO_HOOKS) $(DBINTERFACE_PRIVATE) \
-	    $(NO_LIBLCACHE) $(SYSERRLIST_IN_STDIO) \
-	    $(NS_DIRECTORY)
-
-ifeq ($(ARCH), WINNT)
-DEFS += $(NEEDPROTOS) $(NO_DOMAINNAME) 
-endif
-
-# DEFS += $(USE_LOCKF)
-
-# ACFLAGS are added to CFLAGS but not passed to mkdep, lint, etc
-ACFLAGS		= $(EXTRACFLAGS) $(UNPROTOCFLAGS)
-
-# ALDFLAGS are always placed near the beginning of all linker (cc -o) commands
-ifneq ($(ARCH), WINNT)
-# Passed to every link (ld).  Include -g here if you did in EXTRACFLAGS.
-  EXTRALDFLAGS=-$(LIBPATH)$(LDAP_LIBDIR)
-endif
-
-ifeq ($(ARCH), IRIX)
- ifeq ($(USE_N32), 1)
-  PLATFORMLDFLAGS=-n32 -mips3
- endif
-endif
-
-ALDFLAGS	= $(EXTRALDFLAGS) $(PLATFORMLDFLAGS)
-
-# ALIBS are always placed at the end of all linker (cc -o) commands
-ALIBS		= $(PLATFORMLIBS)
-
-INCLUDES += -I$(LDAP_HDIR) $(PLATFORM_INCLUDE) -I$(DIRVERDIR)
-
-CFLAGS	+=	$(DEFS) $(ACFLAGS) $(INCLUDES)
-
-# default definitions for utilities
-
-ifneq ($(ARCH), WINNT)
-SHELL	= /bin/sh
-endif
-
-AR	= ar cq
-RM	= rm -f
-MV	= mv -f
-
-CP	= cp
-
-CHMOD	= chmod
-CAT	= cat
-
-ifneq ($(ARCH), WINNT)
-LN	= ln -s
-HARDLN	= ln
-endif
-
-TAIL	= tail.exe
-SED	= sed
-LINT	= lint
-5LINT	= lint
-MKDIR	= mkdir -p
-
-ifneq ($(ARCH), WINNT)
-ifndef RANLIB
-RANLIB = ranlib
-endif
-ifndef INSTALL
-INSTALL	= install
-endif
-ifndef INSTALLFLAGS
-INSTALLFLAGS = -c
-endif
-ifndef USE_LD_RUN_PATH
-ifndef RPATHFLAG_PREFIX
-RPATHFLAG_PREFIX="XXX Please define a platform-specific RPATHFLAG_PREFIX in nsldap.mk XXX"
-endif
-ifndef LDRPATHFLAG_PREFIX
-LDRPATHFLAG_PREFIX="XXX Please define a platform-specific LDRPATHFLAG_PREFIX in nsldap.mk XXX"
-endif
-endif
-BASENAME= basename
-DIRNAME	= dirname
-else
-INSTALL = cp.exe -prv
-RM	= rm.exe -rf
-MV	= mv.exe -f
-
-CP	= cp.exe -prv
-LN	= cp.exe -prv
-HARDLN	= cp.exe -prv
-
-CHMOD	= chmod
-CAT	= cat.exe
-MKDIR	= mkdir.exe -p
-endif
-
-MKDEP	= $(LDAP_SRC)/build/mkdep -s -f Make-template
-PWD	= pwd
-DATE	= date
-HOSTNAME= hostname
-
-#
-# Compiler output file
-#
-ifeq ($(ARCH), WINNT)
-EXE_SUFFIX=.exe
-RSC=rc
-OFFLAG=/Fo
-else 
-OFFLAG=-o 
-endif
-
-
-#
-# XXX: does anyone know of a better way to solve the "LINK_LIB2" problem? -mcs
-#
-# Link to produce a console/windows exe on Windows
-#
-ifeq ($(ARCH), WINNT)
-LINK_EXE	= link -OUT:"$@" $(USE_MAP) $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \
-    $(LCFLAGS) /NOLOGO $(PDBOPT) /DEBUGTYPE:BOTH /INCREMENTAL:NO \
-    /SUBSYSTEM:$(SUBSYSTEM) $(DEPLIBS) $(EXTRA_LIBS) $(OBJS)
-LINK_EXE_NOLIBSOBJS	= link -OUT:"$@" $(USE_MAP) $(ALDFLAGS) $(LDFLAGS) \
-    $(ML_DEBUG) $(LCFLAGS) /NOLOGO $(PDBOPT) /DEBUGTYPE:BOTH /INCREMENTAL:NO \
-    /SUBSYSTEM:$(SUBSYSTEM)
-LINK_LIB	= lib -OUT:"$@"  $(OBJS)
-LINK_LIB2	= lib -OUT:"$@"  $(OBJS2)
-LINK_DLL	= link /nologo $(USE_MAP) /DLL $(PDBOPT) /DEBUGTYPE:BOTH \
-	$(ML_DEBUG) /SUBSYSTEM:WINDOWS $(LLFLAGS) $(DLL_LDFLAGS) \
-	$(EXTRA_LIBS) /out:"$@" $(OBJS)
-LINK_DLL2	= link /nologo $(USE_MAP) /DLL $(PDBOPT) /DEBUGTYPE:BOTH \
-	$(ML_DEBUG) /SUBSYSTEM:WINDOWS $(LLFLAGS) $(DLL_LDFLAGS) \
-	$(EXTRA_LIBS) /out:"$@" $(OBJS2)
-else # WINNT
-#
-# UNIX link commands
-#
-LINK_LIB	= $(RM) $@; $(AR) $@ $(OBJS); $(RANLIB) $@
-LINK_LIB2	= $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
-ifeq ($(ARCH), OSF1)
-DLL_LDFLAGS += $(LDRPATHFLAG_PREFIX) $(RPATHFLAG)$(RPATHFLAG_EXTRAS)
-else
-DLL_LDFLAGS += $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS)
-endif
-ifdef SONAMEFLAG_PREFIX
-LINK_DLL	= $(LD) $(ALDFLAGS) $(ARCH_CFLAGS) $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
-			-o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS)
-LINK_DLL2	= $(LD) $(ALDFLAGS) $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS2) \
-			-o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS2)
-else # SONAMEFLAG_PREFIX
-LINK_DLL	= $(LD) $(ALDFLAGS) $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
-			-o $@ $(OBJS)
-LINK_DLL2	= $(LD) $(ALDFLAGS) $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS2) \
-			-o $@ $(OBJS2)
-endif # SONAMEFLAG_PREFIX
-
-ifeq ($(ARCH), HPUX)
-# On HPUX, we need a couple of changes:
-# 1) Use the C++ compiler for linking, which will pass the +eh flag on down to the
-#    linker so the correct exception-handling-aware libC gets used (libnshttpd.sl
-#    needs this).
-# 2) Add a "-Wl,-E,-N" option so the linker gets a "-E,-N" flag.  This makes symbols
-#    in an executable visible to shared libraries loaded at runtime and makes ns-slapd
-#    'normal executable' instead of 'shared executable'.
-DS_LINKEXE_EXTRA_FLAGS=-Wl,-E,-N,+k,+vshlibunsats
-LD=$(CXX)
-
-else
-ifeq ($(ARCH), OSF1)
-DS_LINKEXE_EXTRA_FLAGS=-taso
-else
-ifeq ($(ARCH), IRIX)
-DS_LINKEXE_EXTRA_FLAGS=-exceptions
-endif # IRIX
-endif # OSF
-endif # HPUX
-
-# Define an assortment of UNIX LINK_EXE macros.
-DS_LINKEXE_FLAGS=$(DS_LINKEXE_EXTRA_FLAGS) $(ALDFLAGS) $(LDFLAGS)
-ifdef USE_LD_RUN_PATH
-#does RPATH differently.  instead we export RPATHFLAG as LD_RUN_PATH
-export LD_RUN_PATH=$(RPATHFLAG)
-else # USE_LD_RUN_PATH
-DS_LINKEXE_FLAGS += $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS)
-endif # USE_LD_RUN_PATH
-
-LINK_EXE					= $(CXX) $(DS_LINKEXE_FLAGS) -o $@ \
-									$(OBJS) $(EXTRA_LIBS)
-LINK_EXE_NOLIBSOBJS			= $(CXX) $(DS_LINKEXE_FLAGS) -o $@
-endif # WINNT
-
-#
-# Path to platform-specific directory for berkeley db
-#
-ifeq ($(ARCH), SOLARIS)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/sunos.5.2
-else
-ifeq ($(ARCH), IRIX)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/irix.5.3
-else
-ifeq ($(ARCH), AIX)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/aix.4.2
-else
-ifeq ($(ARCH), OSF1)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/osf.2.0
-else
-ifeq ($(ARCH), HPUX)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/hpux.9.01
-else
-ifeq ($(ARCH), WINNT)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/winnt3.51
-else
-# UNIXWARE || UnixWare
-ifeq ($(subst nix,NIX,$(subst are,ARE,$(ARCH))), UNIXWARE)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/unixware.2.1
-else
-ifeq ($(ARCH), SCOOS)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/scoos.5.0
-else
-ifeq ($(ARCH), NCR)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/ncr.3.0
-else
-ifeq ($(ARCH), SOLARISx86)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/sunosx86.5.2
-else
-ifeq ($(ARCH), ReliantUNIX)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/reliantunix.5.4
-else
-ifeq ($(ARCH), Linux)
-LIBDB_MAKEDIR=$(LDAP_SRC)/libraries/berkeley_db/PORT/linux.2.0
-else
-LIBDB_MAKEDIR=XXX_UNDEFINED_XXX
-endif # Linux
-endif # ReliantUNIX
-endif # SOLARISx86
-endif # NCR
-endif # SCOOS
-endif # UnixWare || UNIXWARE
-endif # WINNT
-endif # HPUX
-endif # OSF1
-endif # AIX
-endif # IRIX
-endif # SOLARIS
-
-#
-# Add platform-specific include directory
-#
-# dboreham: this is bogus, take it out
-ifdef LDAP_USE_OLD_DB
-INCLUDES += -I$(LIBDB_MAKEDIR)/include
-endif
-
-#Changes required for ACL
-ACLINC = $(BUILD_ROOT)/include/libaccess
-#ACLDIR = -$(LIBPATH)$(LDAP_LIBDIR)
-ACLLIB = -laccess -lbase -lsi18n
-# end of changes
-
diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile
deleted file mode 100644
index 3ec9bf18..00000000
--- a/ldap/servers/Makefile
+++ /dev/null
@@ -1,109 +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 ldap/servers
-#
-
-BUILD_ROOT = ../..
-LDAP_SRC = ../
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-PRE_SLAPD_EXTRAS=_ntmsgdll
-POST_SLAPD_EXTRAS=_ntwdog _ntperfdll
-endif
-
-all:	$(PRE_SLAPD_EXTRAS) _slapd $(POST_SLAPD_EXTRAS) _backends _plugins _snmp _slapdtools
-
-
-ifeq ($(ARCH), HPUX)
-# slapd depends on liblcoll.sl on HPUX....
-_slapd:	_collation_plugin
-	cd slapd; $(MAKE) $(MFLAGS) all
-else
-_slapd:
-	cd slapd; $(MAKE) $(MFLAGS) all
-endif
-
-_collation_plugin:
-	cd plugins/collation; $(MAKE) $(MFLAGS) all
-
-_backends:
-	cd slapd/back-ldbm; $(MAKE) $(MFLAGS) all
-# we aren't using back-ldif yet
-#	cd slapd/back-ldif; $(MAKE) $(MFLAGS) all
-
-_plugins:
-	cd plugins; $(MAKE) $(MFLAGS) all
-
-_snmp:
-	cd snmp; $(MAKE) $(MFLAGS) all
-
-_slapdtools:
-	cd slapd/tools; $(MAKE) $(MFLAGS) all
-
-ifeq ($(ARCH), WINNT)
-_ntmsgdll:
-	cd slapd/ntmsgdll; $(MAKE) $(MFLAGS) all
-
-_ntwdog:
-	cd slapd/ntwdog; $(MAKE) $(MFLAGS) all
-
-_ntperfdll:
-	cd slapd/ntperfdll; $(MAKE) $(MFLAGS) all
-endif
-
-clean:
-	cd slapd; $(MAKE) $(MFLAGS) clean
-ifeq ($(ARCH), WINNT)
-	cd slapd/ntmsgdll; $(MAKE) $(MFLAGS) clean
-	cd slapd/ntwdog; $(MAKE) $(MFLAGS) clean
-	cd slapd/ntperfdll; $(MAKE) $(MFLAGS) clean
-endif
-	cd slapd/back-ldbm; $(MAKE) $(MFLAGS) clean
-	cd slapd/back-ldif; $(MAKE) $(MFLAGS) clean
-	cd plugins; $(MAKE) $(MFLAGS) clean
-	cd slapd/tools; $(MAKE) $(MFLAGS) clean
-
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)
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
deleted file mode 100644
index 526350f4..00000000
--- a/ldap/servers/slapd/Makefile
+++ /dev/null
@@ -1,298 +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
-#
-
-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)/servers/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-ifndef INSTDIR
-INSTDIR = /opt/servers/
-endif
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-include $(BUILD_ROOT)/ns_usepurify.mk
-include $(BUILD_ROOT)/ns_usequantify.mk
-include $(LDAP_SRC)/nsdeps.mk
-
-
-ifdef HEAPAGENT
-CFLAGS+=-DPURIFYING
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-ifdef USE_PURIFY
-CFLAGS+=-DPURIFYING
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-ifdef USE_QUANTIFY
-CFLAGS+=-DQUANTIFYING
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-ifndef LDAP_DONT_USE_SMARTHEAP
-include $(BUILD_ROOT)/ns_usesh.mk
-INCLUDES+=-I$(SH_INCLUDE)
-else
-CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
-endif
-
-ifndef LDAP_USE_OLD_DB
-_ldap_db_depend:=$(DB_LIB_DEP)
-INCLUDES+=-I$(DB_INCLUDE)
-endif
-
-INCLUDES += -I. -I$(ACLINC) -I$(BUILD_ROOT)/lib
-
-#ICONS = $(addprefix $(LDAP_SRC)/servers/slapd/ntwdog/, logo.ico key.ico) 
-
-REGULAR_SLAPD_OBJS=	abandon.o bind.o  \
-	compare.o config.o connection.o daemon.o sasl_io.o \
-	detach.o globals.o house.o init.o \
-	monitor.o saslbind.o search.o strdup.o tempnam.o  \
-	unbind.o extendop.o rootdse.o \
-	configdse.o pw_mgmt.o auth.o \
-	psearch.o conntable.o \
-    stubs.o protect_db.o fileio.o lite_entries.o \
-	getopt_ext.o start_tls_extop.o passwd_extop.o
-FEDSE_OBJ= fedse.o
-FEDSE_SRC= fedse.c
-SLAPD_OBJS=	$(REGULAR_SLAPD_OBJS) $(FEDSE_OBJ)
-
-
-ifneq ($(ARCH), WINNT)
-SLAPD_OBJS	+= main.o
-endif
-
-ifeq ($(ARCH), WINNT)
-LDAP_COMMON_EXTRALIBSLIST=libsi18n
-LDAP_COMMON_EXTRALIBS = $(addsuffix .$(LIB_SUFFIX), \
-    $(addprefix $(LDAP_LIBDIR)/, $(LDAP_COMMON_EXTRALIBSLIST)))
-
-EXTRA_LIBS_DEP = \
-	$(LDAP_SDK_LIBLDAP_DLL_DEP) \
-	$(LDAP_SDK_LIBSSLDAP_LIB_DEP) $(LIBLDAPU_DEP) \
-	$(_ldap_db_depend) $(LDAP_COMMON_EXTRALIBS)
-
-EXTRA_LIBS += $(LIBSLAPD) $(LIBLDAPU) $(SVRCORELINK)\
-	$(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	$(LDAP_COMMON_EXTRALIBS)
-
-# JCM - Warnings as Errors
-CFLAGS += /WX
-else
-LDFLAGS	= $(SSLLIBFLAG)
-EXTRA_LIBS_DEP	= $(SECURITY_DEP) $(NSPR_DEP) \
-	$(LDAP_LIBLDBM_DEP) $(LDAP_LIBAVL_DEP) $(LDAP_LIBLDIF_DEP) \
-	$(LDAPSDK_DEP) $(LIBLDAPU_DEP) \
-	$(_ldap_db_depend) \
-	$(SVRCORE_DEP)
-
-
-#IRIX linker needs LIBSEC first, couldn't find away that would make both IRIX and
-# solaris happy, hence the ifeq
-ifeq ($(ARCH), IRIX)
-# -llitekey is added; but it looks to me these two EXTRA_LIBS are identical...
-EXTRA_LIBS = $(LIBSLAPD) \
-	$(LIBLDAPU) $(LDAPLINK) \
-	$(SECURITYLINK) $(NSPRLINK) $(LDAP_LIBLDBM) \
-	$(DBMLINK) -lavl -lldif -llitekey \
-	$(ALIBS) $(DYNALIBS) $(THREADSLIB) $(SVRCORELINK)
-else
-EXTRA_LIBS = $(LIBSLAPD) \
-	$(LIBLDAPU) $(SECURITYLINK) $(LDAPLINK) \
-	$(NSPRLINK) $(LDAP_LIBLDBM) \
-	$(DBMLINK) -lavl -lldif -llitekey \
-	$(ALIBS) $(DYNALIBS) $(THREADSLIB) \
-	$(SVRCORELINK)
-endif
-
-endif
-
-EXTRA_LIBS_DEP+=$(LIBSLAPD_DEP)
-
-EXTRA_LIBS += $(SASL_LINK)
-
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS += -lcrypt -lpthread
-endif
-
-# In order for debugging to work properly with shared libraries on HP/UX,
-# we need to link with end.o.
-ifeq ($(ARCH), HPUX)
-  # need to add arch flags :maybe
-  LDFLAGS+=$(ARCH_CFLAGS)
-  # HPUX linker voodoo
-  ifeq ($(DEBUG), full)
-    ifeq ($(USE_64), 1)
-      EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-      ifneq ($(NSOS_TEST1), ia64)
-        EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o
-      endif
-    else
-      EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-      ifneq ($(NSOS_TEST1), ia64)
-        EXTRA_LIBS += /opt/langtools/lib/end.o
-      endif
-    endif #USE_64
-  endif #DEBUG
-  # Always put libpthread at the beginning of the library list, otherwise NSPR gets upset (very)
-  EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-  EXTRA_LIBS =-lpthread $(EXTRA_LIBS_TEMP) 
-endif #HPUX
-
-#Put SmartHeap at the beginning of the linker library list
-EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-EXTRA_LIBS=$(SH_LIB) $(EXTRA_LIBS_TEMP)
-
-ifeq ($(ARCH), SOLARIS)
-ifeq ($(USE_64), 1)
-LDFLAGS+= -xarch=v9
-endif
-endif
-
-ifeq ($(ARCH), SOLARIS)
-  SH_LIB = -lmtmalloc
-endif
-
-ifeq ($(ARCH), SOLARISx86)
-  SH_LIB= -lmtmalloc
-endif
-
-OBJS = $(addprefix $(OBJDEST)/, $(SLAPD_OBJS)) 
-
-STUB_OBJS = $(addprefix $(OBJDEST)/, stubrepl.o) 
-
-ifeq ($(ARCH), WINNT)
-MAIN_OBJ = $(addprefix $(OBJDEST)/, main.o) 
-SLAPD_RES = $(addprefix $(SVRCORE_LIBPATH)/, ntsvrcore.res)
-EXTRA_OBJS = $(MAIN_OBJ) $(SLAPD_RES) 
-SUBSYSTEM=console
-endif
-
-ifeq ($(ARCH), WINNT)
-SLAPD =		$(addprefix $(BINDIR)/, slapd.exe)
-else
-ifdef USE_PURIFY
-SLAPD =		$(addprefix $(BINDIR)/, ns-slapd.pure)
-else
-ifdef USE_QUANTIFY
-SLAPD =		$(addprefix $(BINDIR)/, ns-slapd.quantify)
-else
-SLAPD =		$(addprefix $(BINDIR)/, ns-slapd)
-endif
-endif
-endif
-
-ifeq ($(ARCH), AIX)
-ifdef OLD_AIX_LINKING
-	CCC = svxlC_r
-endif
-
-#LDFLAGS += -bloadmap:$(BINDIR)/loadmap_slapd
-# setup the bmaxdata flag to use 5 segments (1.25 GB).
-# This is a trade-off that allows dbcachesize to be up to about 1GB.
-LDFLAGS += -bmaxdata:0x50000000
-EXTRA_LIBS += -L$(OBJDIR)  $(EXE_EXTRA_LIBS) 
-LINK_EXE = $(CCC) -bautoexp -brtl $(ALDFLAGS) $(LDFLAGS) \
-			$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) \
-			-o $@ $(OBJS) $(EXTRA_LIBS)
-endif
-
-#ifeq ($(ARCH),OSF1)
-#LINK_EXE = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
-#		$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) \
-#		-o $@ $(OBJS) $(EXTRA_LIBS)
-#endif # OSF1
-
-# Special rule to compile a large source file on Win32:
-#	Use the /Zm option to increase internal compiler heap size.
-ifeq ($(ARCH), WINNT)
-$(OBJDEST)/$(FEDSE_OBJ):	$(FEDSE_SRC)
-	$(CC) -c /Zm250 $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$(FEDSE_OBJ) $(CBSCFLAGS)
-endif
-
-all:	$(OBJDEST) $(BINDIR) $(BUILD_DEP) libslapd $(SLAPD) $(STUB_OBJS)
-
-static:	$(OBJDEST) $(LIBSLAPD)
-
-clientSDK:	static
-
-.PHONY: libslapd push
-
-libslapd $(LIBSLAPD_DEP):
-	$(MAKE) -f libmakefile $(MFLAGS) all
-
-#$(SLAPD_RES): $(LDAP_SRC)/libraries/libutil/ntslapd.rc \
-#		$(DIRVER_H)
-#	$(RSC) -fo $(SLAPD_RES) -i. -i $(OBJDIR)/include $<  
-
-$(SLAPD):	$(SH_LIB_DEP) $(OBJS) $(MAIN_OBJ) $(SLAPD_RES) $(EXTRA_LIBS_DEP)
-	$(QUANTIFY) $(PURIFY) $(PUREOPTS) $(LINK_EXE) $(EXTRA_OBJS) $(DB_LIB)
-
-veryclean: clean
-
-clean:
-	-$(RM) $(OBJS)
-	-$(RM) $(STUB_OBJS)
-ifeq ($(ARCH), WINNT)
-	-$(RM) $(MAIN_OBJ)
-#	-$(RM) $(SLAPD_RES)
-endif
-	-$(RM) $(SLAPD)
-	$(MAKE) -f libmakefile clean
-
-# Target to push the built binary to an installed server
-SLAPD_PUSH = $(addprefix $(INSTDIR)/, bin/slapd/server/slapd.exe)
-push: $(SLAPD_PUSH)
-	$(MAKE) -f libmakefile $(MFLAGS) push
-
-$(SLAPD_PUSH): $(SLAPD)
-	cp $(SLAPD) $(SLAPD_PUSH)
-
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
deleted file mode 100644
index fa8e4927..00000000
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ /dev/null
@@ -1,222 +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 libback-ldbm
-#
-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/libback-ldbm
-
-ifndef INSTDIR
-INSTDIR = /netscape/server4/
-endif
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-ifndef LDAP_USE_OLD_DB
-INCLUDES+=-I$(DB_INCLUDE)
-else
-CFLAGS+=-DLDAP_USE_DB185
-endif
-include $(LDAP_SRC)/nsdeps.mk
-
-CFLAGS+=$(SLCFLAGS)
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-LIBBACK_LDBM_OBJS=	idl.o idl_shim.o idl_new.o idl_common.o cache.o dn2entry.o \
-	id2entry.o index.o haschildren.o nextid.o init.o  \
-	filterindex.o close.o backentry.o monitor.o seq.o start.o \
-	rmdb.o ldif2ldbm.o dblayer.o findentry.o archive.o \
-	sort.o dbsize.o dbtest.o vlv.o vlv_key.o \
-	vlv_srch.o matchrule.o entrystore.o parents.o misc.o \
-	upgrade.o dbversion.o cleanup.o uniqueid2entry.o \
-	perfctrs.o instance.o import-threads.o import.o import-merge.o \
-	ldbm_config.o ldbm_instance_config.o ldbm_index_config.o ldbm_attrcrypt_config.o \
-	ldbm_attr.o \
-	ldbm_abandon.o \
-	ldbm_compare.o \
-	ldbm_add.o \
-	ldbm_search.o \
-	ldbm_modify.o \
-	ldbm_modrdn.o \
-	ldbm_delete.o \
-	ldbm_bind.o \
-	ldbm_unbind.o \
-	ancestorid.o \
-	ldbm_attrcrypt.o \
-	dbhelp.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(LIBBACK_LDBM_OBJS))
-
-ifeq ($(ARCH), WINNT)
-LIBBACK_LDBM_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LIBBACK_LDBM=	$(addprefix $(LDAP_LIBBACK_LDBM_DLLDIR)/, $(LIBBACK_LDBM_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP +=  \
-	$(LDAPSDK_DEP) \
-	$(LDAP_LIBLDIF_DEP) \
-	$(LDAP_LIBAVL_DEP)
-EXTRA_LIBS += \
-	$(NSPRLINK) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LDAP_LIBLDIF) \
-	$(LDAP_LIBAVL)
-CFLAGS+= /WX 
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS_DEP +=  \
-	$(LDAP_SDK_LIBLDAP_DLL_DEP) \
-	$(LDAP_LIBLDIF_DEP) \
-	$(LDAP_LIBAVL_DEP)
-EXTRA_LIBS += \
-	$(NSPRLINK) \
-	$(LDAP_SDK_LIBLDAP_DLL) \
-	$(LDAP_LIBLDIF) \
-	$(LDAP_LIBAVL) \
-	$(DLL_EXTRA_LIBS)
-LD=ld
-endif
-
-ifeq ($(ARCH), SOLARIS)
-EXTRA_LIBS_DEP +=  \
-	$(LDAPSDK_DEP) \
-	$(LDAP_LIBLDIF_DEP) \
-	$(LDAP_LIBAVL_DEP)
-EXTRA_LIBS += \
-	$(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	$(LDAP_LIBLDIF) \
-	$(LDAP_LIBAVL) \
-	$(DLL_EXTRA_LIBS) -lc
-# All the dependent libraries may not be linked with. (e.g., Cyrus SASL)
-# LINK_DLL += -z defs
-endif
-
-ifeq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += \
-	$(LDAPSDK_DEP) \
-	$(LDAP_LIBLDIF_DEP) \
-	$(LDAP_LIBAVL_DEP)
-EXTRA_LIBS += \
-	$(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	$(LDAP_LIBLDIF) \
-	$(LDAP_LIBAVL) \
-	$(DLL_EXTRA_LIBS) -lc
-endif
-
-ifeq ($(ARCH), WINNT)
-DLL_LDFLAGS += -def:"./libback-ldbm.def"
-IMPLIB= /IMPLIB:$(LDAP_LIBBACK_LDBM_LIBDIR)/$(LIBBACK_LDBM_DLL).lib
-MAPFILE= /MAP:$(LDAP_LIBBACK_LDBM_LIBDIR)/$(LIBBACK_LDBM_DLL).map
-endif # WINNT
-
-ifeq ($(ARCH), UnixWare)
-EXTRA_LIBS_DEP += $(LDAP_LIBAVL_DEP)
-EXTRA_LIBS += $(LDAP_LIBAVL)
-endif # UnixWare
-
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS_DEP += $(LDAP_LIBLDBM_DEP) $(LDAP_LIBAVL_DEP) $(LDAP_LIBLDIF_DEP)
-EXTRA_LIBS += $(LDAP_LIBLDBM) $(LDAP_LIBAVL) $(LDAP_LIBLDIF)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS)
-endif # Linux
-
-EXTRA_LIBS_DEP += $(DB_LIB_DEP)
-
-clientSDK: 
-
-all:	$(OBJDEST) $(LDAP_LIBBACK_LDBM_LIBDIR) $(LDAP_LIBBACK_LDBM_DLLDIR) \
-	$(BUILD_DEP) $(LIBBACK_LDBM)
-ifeq ($(ARCH), WINNT)
-	cd ntdbperfdll; $(MAKE) $(MFLAGS) all
-endif
-
-dummy:
-	-@echo LDAP_LIBDIR = $(LDAP_LIB_RELDIR)
-	-@echo LDAP_LIBBACK_LDBM_LIBDIR = $(LDAP_LIBBACK_LDBM_LIBDIR)
-	-@echo LIB_RELDIR = $(LIB_RELDIR)
-	-@echo LDAP_LIBBACK_LDBM_DLLDIR = $(LDAP_LIBBACK_LDBM_DLLDIR)
-	-@echo LDAP_LIBBACK_LDBM = $(LDAP_LIBBACK_LDBM)
-	-@echo LIBBACK_LDBM = $(LIBBACK_LDBM)
-	abort
-
-$(LIBBACK_LDBM): $(OBJS) $(LIBBACK_LDBM_DLL_OBJ) $(EXTRA_LIBS_DEP) $(LIBSLAPD_DEP)
-	$(LINK_DLL)  $(IMPLIB) $(MAPFILE) $(LIBBACK_LDBM_DLL_OBJ) $(EXTRA_LIBS) $(DB_LIB) $(LIBSLAPD)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(LIBBACK_LDBM_DLL_OBJ)
-endif
-	$(RM) $(LIBBACK_LDBM)
-
-$(OBJDEST) $(LIBBACK_LDBM_LIBDIR):
-	$(MKDIR) $@
-
-ifeq ($(ARCH), AIX)
-ifeq ($(DEBUG), optimize)
-
-# For some reason compiling ldif2ldbm.c with the -O flag on AIX causes
-# the new import code to hang.  For now we will avoid the -O flag.
-
-TEMP_CFLAGS = $(subst -O,,$(CFLAGS))
-
-$(OBJDEST)/ldif2ldbm.o: ldif2ldbm.c
-	$(CC) -o $(OBJDEST)/ldif2ldbm.o -c $(TEMP_CFLAGS) $(MCC_INCLUDE) ldif2ldbm.c
-endif
-endif
-
-# Target to push the built binary to an installed server
-LDBM_PUSH = $(addprefix $(INSTDIR)/, lib/libback-ldbm.dll)
-push: $(LDBM_PUSH)
-
-$(LDBM_PUSH): $(LIBBACK_LDBM)
-	cp $(LIBBACK_LDBM) $(LDBM_PUSH)
-
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
deleted file mode 100644
index 20d3e245..00000000
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
+++ /dev/null
@@ -1,72 +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 libback-ldbm
-#
-
-LDAP_SRC = ../../../../..
-BUILD_ROOT = ../../../../../..
-
-OBJDEST = $(OBJDIR)/lib/libback-ldbm
-LIBDIR = $(LDAP_LIBDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-include $(BUILD_ROOT)/ns_usedb.mk
-
-INCLUDES += -I$(LDAP_SRC)/servers/slapd
-
-INDEX_DUMP_OBJS= index_dump.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(INDEX_DUMP_OBJS))
-
-all:	$(OBJDEST) $(LIBDIR) $(SLIBBACK_LDBM) $(LIBBACK_LDBM)
-
-veryclean: clean
-
-clean:
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(BINDIR):
-	$(MKDIR) $(LIBDIR)
-
diff --git a/ldap/servers/slapd/back-ldif/Makefile b/ldap/servers/slapd/back-ldif/Makefile
deleted file mode 100644
index 6b616bc6..00000000
--- a/ldap/servers/slapd/back-ldif/Makefile
+++ /dev/null
@@ -1,112 +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 LDAP Back-ldif backend
-#
-
-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/libback-ldif
-LIBDIR = $(LDAP_LIBDIR)
-SERVER_OBJDEST = $(OBJDIR)/servers/obj
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-BACKLDIF_OBJS	= close.o delete.o modrdn.o unbind.o add.o \
-	compare.o init.o search.o bind.o config.o modify.o monitor.o \
-	start.o
-
-OBJS = $(addprefix $(OBJDEST)/, $(BACKLDIF_OBJS)) 
-
-SERVER_OBJS= ch_malloc.o entry.o result.o modutil.o
-
-EXTRA_OBJS = $(addprefix $(SERVER_OBJDEST)/, $(SERVER_OBJS))
-
-INCLUDES += -I..
-
-ifeq ($(ARCH), WINNT)
-BACKLDIF_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
-endif
-
-LDAP_BACKLDIF=	$(addprefix $(LIBDIR)/, $(LIBBACK_LDIF_DLL).$(DLL_SUFFIX))
-
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS_DEP += $(LIBSECURITY) $(LIBNSPR) \
-	$(LDAP_COMMON_LIBS_DEP) $(LDAP_SDK_LIBS_DEP) \
-	$(LIBSLAPD_DEP) $(LIBLDAPU_DEP)
-
-EXTRA_LIBS += $(LIBSECURITY) $(LIBNSPR) \
-	$(LDAP_COMMON_LIBS) $(LDAP_SDK_LIBS) \
-	$(LIBSLAPD) $(THREADSLIB) $(LIBLDAPU)
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += $(DLL_EXTRA_LIBS)
-endif
-
-clientSDK:
-
-all:	$(OBJDEST) $(LIBDIR) $(LDAP_BACKLDIF)
-
-$(LIBDIR):
-	$(MKDIR) $(LIBDIR)
-
-$(LDAP_BACKLDIF): $(OBJS) $(BACKLDIF_DLL_OBJ)
-	$(LINK_DLL) $(BACKLDIF_DLL_OBJ) $(EXTRA_LIBS)
-
-$(SERVER_OBJDEST)/ch_malloc.o: ../ch_malloc.c
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $< $(OFFLAG)$*.o
-
-clean:
-	$(RM) $(OBJS)
-ifeq ($(ARCH), WINNT)
-	$(RM) $(BACKLDIF_DLL_OBJ)
-endif
-	$(RM) $(LDAP_BACKLDIF)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
diff --git a/ldap/servers/slapd/libsh_stub/Makefile b/ldap/servers/slapd/libsh_stub/Makefile
deleted file mode 100644
index 9614bbed..00000000
--- a/ldap/servers/slapd/libsh_stub/Makefile
+++ /dev/null
@@ -1,90 +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 libsh_stub.so
-#
-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/libsh_stub
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-include $(LDAP_SRC)/nsdeps.mk
-
-
-LIBSH_STUB_C=	libsh_stub.c
-
-SHARE_LIB = $(addprefix $(OBJDEST)/, libsh_stub.so)
-
-# share lib
-CFLAGS = -G $(SLCFLAGS)
-
-# link libmtmalloc.so when built on 5.8 or 5.9
-ifeq ($(ARCH), SOLARIS)
-  LINKFLAGS = -lmtmalloc
-  LIBSH_STUB = libsh_stub
-else
-  # do nothing on non-SOLARIS platforms
-  LIBSH_STUB = no_op
-endif
-
-all: $(LIBSH_STUB)
-
-.PHONY: libsh_stub no_op
-
-libsh_stub: $(OBJDEST) $(SHARE_LIB)
-
-$(SHARE_LIB): $(LIBSH_STUB_C)
-	$(CC) -o $(SHARE_LIB) $(CFLAGS) $(LIBSH_STUB_C) $(LINKFLAGS)
-
-no_op:
-	-@echo libsh_stub.so is not built on $(ARCH) platform
-
-$(OBJDEST) :
-	$(MKDIR) $@
-
-veryclean: clean
-
-clean:
-	$(RM) $(SHARE_LIB)
diff --git a/ldap/servers/slapd/ntmsgdll/Makefile b/ldap/servers/slapd/ntmsgdll/Makefile
deleted file mode 100644
index c152ef0f..00000000
--- a/ldap/servers/slapd/ntmsgdll/Makefile
+++ /dev/null
@@ -1,93 +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 NT messages DLL
-#
-
-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)/ntmsgdll/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-MSGFILE = slapdmessages30
-
-MSG_SRC = ntslapdmessages
-
-NTMSGDLL = $(addprefix $(BINDIR)/, $(MSGFILE).$(DLL_SUFFIX))
-
-LDAP_MSG_OBJS=	$(MSG_SRC).o $(MSG_SRC).res
-
-OBJS = $(addprefix $(OBJDEST)/, $(LDAP_MSG_OBJS)) 
-
-clientSDK: all
-
-all:	$(OBJDEST) $(BINDIR) $(NTMSGDLL)
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-	$(RM) $(OBJDEST)/msg00001.bin
-	$(RM) $(LDAP_HDIR)/$(MSG_SRC).h
-	$(RM) $(OBJDEST)/$(MSG_SRC).rc
-	$(RM) $(NTMSGDLL)
-
-$(OBJDEST):
-	$(MKDIR) $@
-
-$(NTMSGDLL): $(OBJS) $(LDAP_HDIR)/$(MSG_SRC).h
-	$(LINK_DLL)
-
-$(LDAP_HDIR)/$(MSG_SRC).h: $(MSG_SRC).mc
-
-$(OBJDEST)/msg0001.bin: $(MSG_SRC).mc
-
-$(OBJDEST)/$(MSG_SRC).rc: $(MSG_SRC).mc 
-	$(MC) $< -h $(LDAP_HDIR) -r $(OBJDEST)
-
-$(OBJDEST)/$(MSG_SRC).res: $(OBJDEST)/$(MSG_SRC).rc
-	$(RSC) -fo $(OBJDEST)/$(MSG_SRC).res $< 
diff --git a/ldap/servers/slapd/ntperfdll/Makefile b/ldap/servers/slapd/ntperfdll/Makefile
deleted file mode 100644
index 448ef9bb..00000000
--- a/ldap/servers/slapd/ntperfdll/Makefile
+++ /dev/null
@@ -1,84 +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
-#
-
-BUILD_ROOT = ../../../..
-LDAP_SRC = ../../..
-
-OBJDEST = $(OBJDIR)/servers/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-ALLDIRS = $(BINDIR) $(OBJDEST)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-LINK32=link.exe
-
-MC=mc	#message compiler?
-
-DLLS = nsldapctr
-
-# -D's get all screwed up: we need to fix them:
-CFLAGS+= -UNS_PERSONAL
-# this lets us pickup regparms.h
-CFLAGS += -I $(BUILD_ROOT)/include
-
-MCS = nsldapctrmc
-DEPMC = $(addsuffix .h, $(MCS))
-
-OBJS  = $(OBJDEST)/nsldapctr.o $(OBJDEST)/nsldapctrutil.o
-
-RELFILES = nsldapctrs.ini nsldapctrdef.h
-
-DESTRELFILES = $(addprefix $(LDAP_INSTALL_BIN_RELDIR)/, $(RELFILES))
-
-all: $(ALLDIRS) $(addprefix $(BINDIR)/, $(addsuffix .dll, $(DLLS) ) ) $(DESTRELFILES)
-
-nsldapctrmc.h: 
-	$(MC) -s -v $*.mc
-
-$(OBJDEST)/%.o: %.cpp
-	cl -nologo -c $(CFLAGS) $(MCC_INCLUDE) /Tp $< -Fo$@
-
-$(BINDIR)/nsldapctr.dll: $(DEPMC) $(OBJS)
-	$(LINK_DLL) /OUT:$@ /DEF:exports.def
-
-$(LDAP_INSTALL_BIN_RELDIR)/%: % $(LDAP_INSTALL_BIN_RELDIR)
-	$(CP) $< $(dir $@)
diff --git a/ldap/servers/slapd/ntwdog/Makefile b/ldap/servers/slapd/ntwdog/Makefile
deleted file mode 100644
index 883aaf7f..00000000
--- a/ldap/servers/slapd/ntwdog/Makefile
+++ /dev/null
@@ -1,91 +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 LDAP Server NT Service watchdog
-#
-
-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)/ntwdog/obj
-SLAPD_OBJDEST= $(OBJDIR)/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-LDAP_LIBDIR = $(OBJDIR)/lib
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), WINNT)
-SUBSYSTEM=windows
-endif
-
-#INCLUDES += -I$(BUILD_ROOT)/include/libadmin 
-
-DS_SERVER_DEFS =
-
-NTWDOG_OBJS=	ntwatchdog.o 
-
-OBJS = $(addprefix $(OBJDEST)/, $(NTWDOG_OBJS)) 
-
-LIBS_DEP = $(LDAP_LIBUTIL_DEP) $(LIBADMIN_DEP)
-
-LIBS = $(LDAP_LIBUTIL)
-
-EXTRA_LIBS += $(LIBS) 
-
-NTWDOG = $(addprefix $(BINDIR)/, ns-slapd.exe) 
-
-all:	$(OBJDEST) $(BINDIR) $(NTWDOG)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(NTWDOG):	$(OBJS) $(LIBS_DEP)
-	$(LINK_EXE) 
-
-veryclean: clean
-
-clean:
-	$(RM) $(OBJS)
-	$(RM) $(NTWDOG)
-
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
deleted file mode 100644
index 736fe03b..00000000
--- a/ldap/servers/slapd/tools/Makefile
+++ /dev/null
@@ -1,216 +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 LDAP Server tools.
-#
-
-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)/servers/tools/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-
-SLAPD_OBJDIR = $(LDAP_OBJDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-ifndef LDAP_USE_OLD_DB
-INCLUDES+=-I$(DB_INCLUDE)
-else
-CFLAGS+=-DLDAP_USE_DB185
-endif
-
-SLAPDHDIR = ../
-
-ifeq ($(ARCH), OSF1)
-PLATFORM_SPECIFIC_EXTRA_LIBRARY = -lcxx
-else # OSF1
-# oems might need to edit this for their platform
-PLATFORM_SPECIFIC_EXTRA_LIBRARY =
-endif # OSF1
-
-INCLUDES += $(SSLINCLUDE)
-DEFS += $(SSL)
-
-OBJS1 += $(OBJDEST)/pwenc.o 
-
-ifeq ($(USE_64), 1)
- ifeq ($(ARCH), HPUX)
-  ifeq ($(NSOS_RELEASE),B.11.23)
-   LDFLAGS += -lpthread +DD64
-  else
-   LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
-  endif
- endif
- ifeq ($(ARCH), SOLARIS)
-  LDFLAGS += -xarch=v9 
- endif
-endif
-
-CFLAGS += $(ARCH_CFLAGS)
-
-INCLUDES += -I$(SLAPDHDIR) -I$(LDAP_ADMINCDIR)
-INCLUDES += -I$(ACLINC)
-INCLUDES +=  -I ../../plugins/rever
-LDFLAGS	+= $(EXLDFLAGS) $(SSLLIBFLAG)
-
-ifeq ($(ARCH), WINNT)
-SUBSYSTEM=console
-endif
-
-DEPLIBS=
-
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) \
-	$(LDAP_LIBLDIF_DEP) \
-	$(LDAP_SLIBLCACHE_DEP) $(DB_LIB_DEP) $(LIBSLAPD_DEP) \
-	$(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
-
-EXTRA_LIBS += $(LDAPLINK) \
-	$(LDAP_SLIBLCACHE) $(DB_LIB) \
-	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) $(LIBSLAPD) $(LDAP_LIBLITEKEY) \
-	$(ALIBS) \
-	$(SECURITYLINK) $(DBMLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK) \
-	$(SASL_LINK)
-
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS += -lcrypt
-endif
-
-
-KEYUPG_LIBS_DEP=
-KEYUPG_LIBS=$(LDAP_LIBLITEKEY)
-
-ifeq ($(ARCH), WINNT)
-KEYUPG_LIBS_DEP=$(LDAP_LIBUTIL_DEP)
-KEYUPG_LIBS += $(LDAP_LIBUTIL)
-endif
-
-ifdef HEAPAGENT
-CFLAGS+=-DPURIFYING
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-# It looks like all of the latest versions of Unix that we ship on
-# have a good enough heap implementations that they don't need
-# SmartHeap.  We still need it on NT.
-ifneq ($(ARCH), WINNT)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-# Don't use smartheap for debug builds on NT
-ifeq ($(ARCH), WINNT)
-ifeq ($(DEBUG), full)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-endif
-
-ifndef LDAP_DONT_USE_SMARTHEAP
-include $(BUILD_ROOT)/ns_usesh.mk
-_smartheap_depend = $(SH_LIB_DEP)
-else
-CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
-endif
-
-
-TOOL_OBJS =  ldif.o keyupg.o pwenc.o mmldif.o migratecred.o eggencode.o dbscan.o
-ALL_OBJS = $(addprefix $(OBJDEST)/, $(TOOL_OBJS))
-
-LDIF = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, ldif))
-PWDHASH = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, pwdhash))
-MIGRATECRED = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, migratecred))
-KEYUPG = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, keyupg))
-MMLDIF = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, mmldif))
-EGGENCODE = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, eggencode))
-DBSCAN = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, dbscan))
-
-BINS=	$(LDIF) $(PWDHASH) $(KEYUPG) $(MMLDIF) $(MIGRATECRED) $(DBSCAN)
-EXTRABINS=	$(EGGENCODE)
-
-all:	$(OBJDEST) $(BINDIR) $(LDAP_ADMIN_BIN_RELDIR) $(BINS) buildRsearch buildLdclt
-		
-extras:	$(OBJDEST) $(BINDIR) $(EGGENCODE)
-
-$(LDIF):	$(OBJDEST)/ldif.o $(LDAP_LIBLDIF_DEP)
-	$(LINK_EXE) $< $(LDAP_LIBLDIF) $(SASL_LINK)
-
-$(PWDHASH):	$(OBJS1) $(EXTRA_LIBS_DEP)
-	$(LINK_EXE) $(OBJS1) $(EXTRA_LIBS) 
-
-$(MIGRATECRED):	$(OBJDEST)/migratecred.o $(EXTRA_LIBS_DEP)
-	$(LINK_EXE) $(OBJDEST)/migratecred.o $(EXTRA_LIBS) 
-
-$(KEYUPG):      $(OBJDEST)/keyupg.o  $(KEYUPG_LIBS_DEP)
-	$(LINK_EXE_NOLIBSOBJS) $<  $(KEYUPG_LIBS)
-
-$(MMLDIF):	$(OBJDEST)/mmldif.o $(EXTRA_LIBS_DEP)
-	$(LINK_EXE_NOLIBSOBJS) $(OBJDEST)/mmldif.o $(EXTRA_LIBS) 
-
-$(EGGENCODE):	$(OBJDEST)/eggencode.o
-	$(LINK_EXE_NOLIBSOBJS) $(OBJDEST)/eggencode.o
-
-$(DBSCAN):	$(OBJDEST)/dbscan.o
-	$(LINK_EXE) $<
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-buildRsearch:
-	cd rsearch; $(MAKE) LDFLAGS="$(LDFLAGS)"
-
-buildLdclt:
-	cd ldclt; $(MAKE) LDFLAGS="$(LDFLAGS)"
-
-clean:
-	-$(RM) $(ALL_OBJS)
-	-$(RM) $(BINS) $(EXTRABINS)
-	cd rsearch; $(MAKE) clean
-
diff --git a/ldap/servers/slapd/tools/ldclt/Makefile b/ldap/servers/slapd/tools/ldclt/Makefile
deleted file mode 100644
index 5209c952..00000000
--- a/ldap/servers/slapd/tools/ldclt/Makefile
+++ /dev/null
@@ -1,138 +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) 2006 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-#	This Makefile is targetted to build the ldclt tool. This tool is a 
-#	multithreaded ldap client, specially targetted to ensure good 
-#	reliability of the product under test.
-#
-# -----------------------------------------------------------------------------
-
-LDAP_SRC = ../../../..
-BUILD_ROOT = ../../../../..
-
-OBJDEST = $(OBJDIR)/servers/tools/obj
-BINDIR = $(RELDIR)/usr/bin
-DATDIR = $(RELDIR)/usr/share/data
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(OS_ARCH), WINNT)
-OBJEXT          =.obj
-else
-OBJEXT          =.o
-endif
-
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
-
-EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
-	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
-	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(SASL_LINK)
-
-LDCLTSRC	= \
-		data.c \
-		ldapfct.c \
-		ldclt.c \
-		ldcltU.c \
-		parser.c \
-		port.c \
-		scalab01.c \
-		threadMain.c \
-		utils.c \
-		version.c \
-		workarounds.c
-
-#ifdef SUN_DS_3_X_SUPPORT
-LDCLTSRC	+= opCheck.c
-#endif
-
-LDCLTOBJS	= $(addprefix $(OBJDEST)/, $(LDCLTSRC:.c=$(OBJEXT)))
-
-HDIR            = $(LDAP_SRC)/include
-
-LDCLTBIN	= $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldclt))
-
-INC_FILES	= \
-		ldclt.h \
-		port.h \
-		utils.h \
-		remote.h
-
-INC_PLUGINS	= \
-		scalab01.h 
-
-ADDLIBS		= $(LDAPLIBS) $(SPEC_LIBS) $(SYSTEM_LIBS) $(END)
-
-CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
-
-ifeq ($(ARCH), Linux)
-CFLAGS+=-D_XOPEN_SOURCE=500
-endif
-
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP)
-
-EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
-	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
-	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS)
-
-##########################################################################
-
-all: $(OBJDEST) $(BINDIR) $(LDCLTBIN)
-
-clean:
-	-$(RM) $(LDCLTOBJS) $(LDCLTBIN)
-
-$(OBJDEST): 
-	if [ ! -d $(OBJDEST) ]; then \
-		$(MKDIR) $(OBJDEST); \
-	fi
-
-$(BINDIR):
-	if [ ! -d $(BINDIR) ]; then \
-		$(MKDIR) $(BINDIR); \
-	fi
-
-$(LDCLTBIN): $(LDCLTOBJS)
-	$(LINK_EXE) $(LDCLTOBJS) $(EXTRA_LIBS)
-	-chmod 755 $(LDCLTBIN)
-
diff --git a/ldap/servers/slapd/tools/rsearch/Makefile b/ldap/servers/slapd/tools/rsearch/Makefile
deleted file mode 100644
index 8a85af00..00000000
--- a/ldap/servers/slapd/tools/rsearch/Makefile
+++ /dev/null
@@ -1,155 +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) 2006 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# gnu makefile for LDAP Server tools.
-#
-
-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)/servers/tools/obj
-BINDIR = $(RELDIR)/usr/bin
-DATDIR = $(RELDIR)/usr/share/$(DS_BRAND)-ds/data
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), OSF1)
-PLATFORM_SPECIFIC_EXTRA_LIBRARY = -lcxx
-else # OSF1
-# oems might need to edit this for their platform
-PLATFORM_SPECIFIC_EXTRA_LIBRARY =
-endif # OSF1
-
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
-
-EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
-	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
-	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS)  $(SASL_LINK)
-
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS += -lcrypt
-endif
-
-# It looks like all of the latest versions of Unix that we ship on
-# have a good enough heap implementations that they don't need
-# SmartHeap.  We still need it on NT.
-ifneq ($(ARCH), WINNT)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-# Don't use smartheap for debug builds on NT
-ifeq ($(ARCH), WINNT)
-ifeq ($(DEBUG), full)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-endif
-
-ifndef LDAP_DONT_USE_SMARTHEAP
-include $(BUILD_ROOT)/ns_usesh.mk
-_smartheap_depend = $(SH_LIB_DEP)
-else
-CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
-endif
-
-RSEARCHSRC := nametable.c sdattable.c searchthread.c rsearch.c
-	
-INFADDSRC := nametable.c addthread.c infadd.c
-
-DATAFILES := scripts/dbgen-GivenNames scripts/dbgen-FamilyNames scripts/dbgen-OrgUnits
-
-DBGEN := scripts/dbgen.pl 
-
-ifeq ($(OS_ARCH), WINNT)
-OBJEXT :=.obj
-else
-OBJEXT :=.o
-endif
-
-RSEARCHOBJS	= $(addprefix $(OBJDEST)/, $(RSEARCHSRC:.c=$(OBJEXT)))
-INFADDOBJS	= $(addprefix $(OBJDEST)/, $(INFADDSRC:.c=$(OBJEXT)))
-HDIR		= $(LDAP_SRC)/include
-
-ALL_OBJS = $(RSEARCHOBJS) $(INFADDOBJS)
-
-RSEARCH = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, rsearch))
-INFADD = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, infadd))
-DBGEN = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, dbgen.pl))
-
-BINS=	$(RSEARCH) $(INFADD) $(DBGEN)
-
-all:	$(OBJDEST) $(BINDIR) $(BINS) $(DATDIR)
-
-$(RSEARCH):	$(RSEARCHOBJS) $(BINDIR)
-	$(LINK_EXE) $(RSEARCHOBJS) $(LDAP_LIBLDIF)
-	-chmod 755 $(RSEARCH)
-
-$(INFADD):	$(INFADDOBJS) $(BINDIR)
-	$(LINK_EXE) $(INFADDOBJS) $(LDAP_LIBLDIF)
-	-chmod 755 $(INFADD)
-
-$(DBGEN): scripts/dbgen.pl $(BINDIR)
-	cp scripts/dbgen.pl $(BINDIR)
-	-chmod 755 $(DBGEN)
-
-$(OBJDEST):
-	if [ ! -d $(OBJDEST) ]; then \
-	  $(MKDIR) $(OBJDEST); \
-	fi
-
-$(BINDIR):
-	if [ ! -d $(BINDIR) ]; then \
-	  $(MKDIR) $(BINDIR); \
-	fi
-
-$(DATDIR):
-	-$(RM) -r $(DATDIR)
-	-$(MKDIR) $(DATDIR)
-	cp scripts/dbgen-* $(DATDIR)
-
-clean:
-	-$(RM) $(ALL_OBJS)
-	-$(RM) -r $(BINS) $(DATDIR)
-
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
deleted file mode 100644
index 50a48c35..00000000
--- a/ldap/servers/snmp/Makefile
+++ /dev/null
@@ -1,141 +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
-#
-#
-# 	Make file SNMP subagent for Fedora Directory Server
-#
-#
-# 	Revision History:
-#	
-#	07/31/97 Created by stevross
-#	
-#  
-
-BUILD_ROOT = ../../..
-LDAP_SRC = ../..
-
-NOSTDCLEAN=true # don't let nsconfig.mk define target clean
-NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-
-OBJDEST = $(OBJDIR)/ldap-agent
-BINDIR = $(LDAP_SERVER_RELDIR)
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ARCH := $(shell uname -s)
-ifneq ($(ARCH), WINNT)
-ARCH := $(shell $(BUILD_ROOT)/nsarch)
-endif
-
-ifeq ($(USE_64), 1)
- ifeq ($(ARCH), HPUX)
-  ifeq ($(NSOS_RELEASE), B.11.23)
-    LDFLAGS += -lpthread +DD64 +Z
-  else
-    LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
-  endif
- endif
- ifeq ($(ARCH), SOLARIS)
-  LDFLAGS += -xarch=v9
- endif
-endif
-
-SNMP_OBJS = main.o ldap-agent.o agtmmap.o
-OBJS = $(addprefix $(OBJDEST)/, $(SNMP_OBJS))
-SNMPMODULE  = ldap-agent
-AGTMMAP_DIR = $(LDAP_SRC)/servers/slapd
-
-ifneq ($(ARCH), WINNT)
-  INCLUDES += -I. $(NETSNMP_INCLUDE) $(NSPR_INCLUDE)
-  EXTERNAL_AGENT_LIBS = $(shell $(NETSNMP_BINDIR)/net-snmp-config --external-agent-libs)
-  EXTRA_LIBS += $(NETSNMP_LINK) $(EXTERNAL_AGENT_LIBS)
-endif
-
-# the redhat-directory.mib goes in the _datadir/brand-ds/plugins/snmp directory, and the other mib like
-# files go in the _datadir/brand-ds/plugins/snmp/mibs directory
-MIB_DEST_DIR = $(RELDIR)/$(DS_PLUGINDIR)/snmp
-MIB_SRC_FILES =redhat-directory.mib
-MIBS_DEST_DIR = $(MIB_DEST_DIR)/mibs
-MIBS_SRC_FILES = NETWORK-SERVICES-MIB.txt \
-	RFC1155-SMI.txt	\
-	RFC-1215.txt \
-	SNMPv2-CONF.txt \
-	SNMPv2-SMI.txt \
-	SNMPv2-TC.txt
-MIB_DEST_FILES = $(addprefix $(MIBS_DEST_DIR)/,$(notdir $(MIBS_SRC_FILES))) \
-	$(addprefix $(MIB_DEST_DIR)/,$(MIB_SRC_FILES))
-
-default: all
-
-ifneq ($(ARCH), WINNT)
-all: $(OBJDEST) $(BINDIR)/$(SNMPMODULE) $(MIB_DEST_DIR)/$(MIB_SRC_FILES) $(MIB_DEST_FILES)
-else
-OBJ_SUFFIX=obj
-all: $(MIB_DEST_FILES)
-	cd ntagt; $(MAKE) $(MFLAGS) all
-endif
-
-# Rule to make agtmmap
-$(OBJDEST)/agtmmap.o: $(AGTMMAP_DIR)/agtmmap.c
-	$(CC) $(CFLAGS) -g -o $@ -c $<
-
-# Rule to create destination directories
-$(MIBS_DEST_DIR) $(MIB_DEST_DIR) $(OBJDEST):
-	$(MKDIR) $@
-
-# Rule to build subagent binary
-$(BINDIR)/$(SNMPMODULE): $(OBJS)
-	$(LINK_EXE)
-
-# this rule is for mib files in the local directory that go in the nsmib directory
-$(MIB_DEST_DIR)/$(MIB_SRC_FILES): $(MIB_DEST_DIR)
-	$(CP) ./$(MIB_SRC_FILES) $@
-
-# this rule is for mib files which go in the mibs subdir
-$(MIBS_DEST_DIR)/%: % $(MIBS_DEST_DIR)
-	$(CP) $< $@
-
-clean: localclean
- 
-localclean:
-ifneq ($(ARCH), WINNT)
-	$(RM) $(EXTDEST)/$(SNMPMODULE)$(EXE_SUFFIX)
-endif
-
diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile
deleted file mode 100644
index 501defdf..00000000
--- a/ldap/servers/snmp/ntagt/Makefile
+++ /dev/null
@@ -1,134 +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
-#
-#############################################################################
-#                       SNMP NT Subagent Common Rulesets                    #
-#############################################################################
-
-BUILD_ROOT   =   ../../../..
-MSRV_ROOT   =   ../../..
-SLAPD_ROOT  =   $(MSRV_ROOT)/servers/slapd
-SNMP_ROOT   =   $(MSRV_ROOT)/servers/snmp
-LIBDEST     =   $(OBJDIR)/obj
-BINDIR      =   $(LDAP_SERVER_RELDIR)
-
-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         $(MSRV_ROOT)/nsldap.mk
-
-OBJ_SUFFIX  = obj
-
-INCLUDES    +=   -I../../slapd -I$(BUILD_ROOT)/ldap/include
-
-CCOPTS      +=  $(CFLAGS) $(DLL_CFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) 
-CXXOPTS     +=  $(CFLAGS) $(DLL_CXXFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) 
- 
-EXTRA_LIBS =  advapi32.lib user32.lib snmpapi.lib mgmtapi.lib $(LDAP_SDK_LIBLDAP_DLL) 
-
-#############################################################################
-#                   SNMP NT Subagent Core Components                        #
-#############################################################################
-
-LOCAL_SRCS      =  agtmmap.c      \
-				   nsldapagt_nt.c \
-                   nsldapmib_nt.c
-
-SNMP_SRCS       =  $(LOCAL_SRCS)
-
-LOCAL_INCS      =  agtmmap.h      \
-				   nsldapagt_nt.h \
-                   nsldapmib_nt.h
-
-SNMP_INCS       =  $(LOCAL_INCS)
-
-SNMP_OBJS       =  $(addprefix $(LIBDEST)/, \
-			agtmmap.$(OBJ_SUFFIX) \
-			nsldapagt_nt.$(OBJ_SUFFIX) \
-			nsldapmib_nt.$(OBJ_SUFFIX))
-
-
-SNMP_LIB	=  ns-ldapagt.$(DLL_SUFFIX)
-SNMP_IMPLIB	=  ns-ldapagt.$(LIB_SUFFIX)
-
-#############################################################################
-#                  SNMP NT Subagent Build Rules                             #
-#############################################################################
-
-# Now we get into the actual build rules
-AGTMMAP = agtmmap
-
-all: $(LDAP_SERVER_RELDIR) $(AGTMMAP) $(BINDIR)/$(SNMP_LIB)
-
-over: clean all
-
-$(AGTMMAP): $(SLAPD_ROOT)/$(AGTMMAP).c $(SLAPD_ROOT)/$(AGTMMAP).h
-	$(CP) $(SLAPD_ROOT)/$(AGTMMAP).c .
-	$(CP) $(SLAPD_ROOT)/$(AGTMMAP).h .
-
-$(SNMP_OBJS): $(SNMP_SRCS) $(SNMP_INCS)
-
-$(BINDIR)/$(SNMP_LIB): $(SNMP_OBJS) $(SNMP_RES) Makefile
-	$(LINK_DLL) $(LD_EXTRAS) /DEF:"nsldapagt_nt.def" /VERSION:"1" \
-	$(SNMP_OBJS) $(EXTRA_LIBS)
-
-$(LIBDEST)/%.$(OBJ_SUFFIX): %.cxx
-	$(CCP) -c $(CXXOPTS) $< -Fo$(LIBDEST)/$*.$(OBJ_SUFFIX)
- 
-$(LIBDEST)/%.$(OBJ_SUFFIX): %.c
-	$(CC) -c $(CCOPTS) $< -Fo$(LIBDEST)/$*.$(OBJ_SUFFIX)
-
-$(LIBDEST)/%.$(OBJ_SUFFIX): $(SNMP_ROOT)/%.cxx
-	$(CCP) -c $(CXXOPTS) $< -Fo$(LIBDEST)/$*.$(OBJ_SUFFIX)
- 
-$(LIBDEST)/%.$(OBJ_SUFFIX): $(SNMP_ROOT)/%.c
-	$(CC) -c $(CCOPTS) $< -Fo$(LIBDEST)/$*.$(OBJ_SUFFIX)
-
-clean: localclean
-
-localclean:
-	$(RM) $(SNMP_OBJS) $(LIBDEST)/$(SNMP_LIB) $(LIBDEST)/$(SNMP_IMPLIB) $(AGTMMAP).c $(AGTMMAP).h
-
-#############################################################################
-#                            Depend Area                                    #
-#############################################################################
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
diff --git a/ldap/systools/Makefile b/ldap/systools/Makefile
deleted file mode 100644
index 128f8409..00000000
--- a/ldap/systools/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 LDAP Server tools.
-#
-
-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)/servers/tools/obj
-BINDIR = $(LDAP_SERVER_RELDIR)
-
-SLAPD_OBJDIR = $(LDAP_OBJDIR)
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-ifeq ($(ARCH), OSF1)
-PLATFORM_SPECIFIC_EXTRA_LIBRARY = -lcxx
-else # OSF1
-# oems might need to edit this for their platform
-PLATFORM_SPECIFIC_EXTRA_LIBRARY =
-endif # OSF1
-
-
-ifeq ($(USE_64), 1)
- ifeq ($(ARCH), HPUX)
-  ifeq ($(NSOS_RELEASE),B.11.23)
-   LDFLAGS += +DD64
-  else
-   LDFLAGS += +DA2.0W +DS2.0 +Z
-  endif
- endif
- ifeq ($(ARCH), SOLARIS)
-  LDFLAGS += -xarch=v9
- endif
-endif
-
-LDFLAGS	+= $(EXLDFLAGS)
-
-DEPLIBS=
-
-EXTRA_LIBS_DEP =
-
-EXTRA_LIBS = $(PLATFORM_SPECIFIC_EXTRA_LIBRARY)
-
-ifeq ($(ARCH), Linux)
-EXTRA_LIBS += -lcrypt
-endif
-
-ifeq ($(ARCH), SOLARIS)
-EXTRA_LIBS += -lelf
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_LIBS += -lodm
-endif
-
-TOOL_OBJS =  idsktune.o pio.o viewcore.o
-ALL_OBJS = $(addprefix $(OBJDEST)/, $(TOOL_OBJS))
-
-DSKTUNE = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, dsktune))
-VIEWCORE = $(addsuffix $(EXE_SUFFIX), \
-	$(addprefix $(BINDIR)/, viewcore))
-
-ifeq ($(ARCH), SOLARIS)
-BINS=	$(DSKTUNE) $(VIEWCORE)
-else
-BINS=	$(DSKTUNE) 
-endif
-
-all:	$(OBJDEST) $(BINDIR) $(BINS)
-
-$(DSKTUNE):	$(OBJDEST)/idsktune.o $(OBJDEST)/pio.o $(EXTRA_LIBS_DEP)
-	$(LINK_EXE_NOLIBSOBJS) $< $(OBJDEST)/pio.o $(EXTRA_LIBS)
-
-$(VIEWCORE):	$(OBJDEST)/viewcore.o $(EXTRA_LIBS_DEP)
-	$(LINK_EXE_NOLIBSOBJS) $< $(EXTRA_LIBS) 
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-$(OBJDEST)/idsktune.o: sol_patches.c hp_patches.c
-
-clean:
-	-$(RM) $(ALL_OBJS)
-	-$(RM) $(BINS)
-
-
diff --git a/ns_usepurify.mk b/ns_usepurify.mk
deleted file mode 100644
index f8af5e48..00000000
--- a/ns_usepurify.mk
+++ /dev/null
@@ -1,52 +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
-#
-#
-# included Makefile to make building with Purify easier
-#
-
-ifneq ($(ARCH), SOLARIS)
-USE_PURIFY=
-endif
-
-ifdef USE_PURIFY
-PURIFY=purify
-PUREOPTS=-best-effort -always-use-cache-dir=yes -cache-dir=/export/share/pub/richm/purify -follow-child-processes=yes -max-threads=256 -check-debug-timestamps=no
-#PUREOPTS=-follow-child-processes=yes -max-threads=256 -check-debug-timestamps=no
-endif # USE_PURIFY
diff --git a/ns_usequantify.mk b/ns_usequantify.mk
deleted file mode 100644
index d228c04a..00000000
--- a/ns_usequantify.mk
+++ /dev/null
@@ -1,50 +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
-#
-#
-# included Makefile to make building with Quantify easier
-#
-
-ifneq ($(ARCH), SOLARIS)
-USE_QUANTIFY=
-endif
-
-ifdef USE_QUANTIFY
-QUANOPTS=-best-effort -always-use-cache-dir=yes -follow-child-processes=yes -max-threads=256 -check-debug-timestamps=no
-QUANTIFY=quantify $(QUANOPTS)
-endif # USE_QUANTIFY
diff --git a/ns_usesh.mk b/ns_usesh.mk
deleted file mode 100644
index 8fff42c6..00000000
--- a/ns_usesh.mk
+++ /dev/null
@@ -1,170 +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
-#
-#
-# this is ns_usesh.mk
-# a make include file intended to make the use of SmartHeap
-# within builds easier. 
-# winges to: dboreham
-ifdef bogus_variable_to_skip_comments
-# to use this:
-# include nsconfig.mk because this file uses stuff defined in there
-# in your makefile, define SH_VERSION if you need to
-# (defaults to the latest version otherwise)
-# include this file.
-# you can now use the following variables in your
-# makefile:
-#	SH_LIB_DEP	Declare a dependency on this if you want to rebuild when the DB lib changes
-#	SH_INCLUDE	The pathname to the DB include directory use -I$(SH_INCLUDE) in CFLAGS to pickup the db header
-#	SH_LIBPATH	The pathname to the DB libraries. Use this to find the .so or .dll file
-#	SH_LIB		The pathname to the DB library file---put this on your linker command line to pickup the library
-#	SH_STATIC_LIB	The pathname to a static link version of DB.
-#
-#	Here is a sample:
-#
-#BUILD_ROOT=..
-#
-#include $(BUILD_ROOT)/nsconfig.mk
-#include $(BUILD_ROOT)/ns_usesh.mk
-#
-#
-#ifeq ($(ARCH), WINNT)
-#EXE_SUFFIX=.exe
-#OBJ_SUFFIX=obj
-#%.exe: %.$(OBJ_SUFFIX)
-#	$(CC) $(LDFLAGS) $< -o $@
-#%.$(OBJ_SUFFIX): %.c
-#	$(CC) $(CFLAGS) -c $< -o $@
-#else
-## currently assume that if not NT then UNIX
-#EXE_SUFFIX=
-#OBJ_SUFFIX=o
-#endif
-#
-#LINK_EXE	= $(CC) $(LDFLAGS) -o $@ $(OBJS) $< $(EXTRA_LIBS)
-#
-#
-## these modules use SH, so we add to CFLAGS to ensure the headers get found
-#CFLAGS += -I$(SH_INCLUDE)
-## and, again because they us DB, we add the db library to the link flags
-#EXTRA_LIBS += $(SH_LIB)
-#
-#target=prog
-#
-#target_bin=prog$(EXE_SUFFIX)
-#
-#print:
-#	@echo =========== Building with the follow SH Variables ============
-#	@echo SH_LIB_DEP=$(SH_LIB_DEP)
-#	@echo SH_INCLUDE=$(SH_INCLUDE)
-#	@echo SH_LIBPATH=$(SH_LIBPATH)
-#	@echo SH_LIB=$(SH_LIB)
-#	@echo SH_STATIC_LIB=$(SH_STATIC_LIB)
-#	@echo SH_VERSION=$(SH_VERSION)
-#	@echo =========== ===================================== ============
-#	
-#all: 	print $(SH_LIB_DEP) $(target_bin)
-#
-#$(target_bin): $(target).$(OBJ_SUFFIX)
-#	$(LINK_EXE)
-#
-endif
-
-#if no version specified, we'll use the latest one
-ifndef SH_VERSION
-SH_VERSION=latest
-endif
-
-# this is the _only_ place the component name gets defined
-# if you're the next person adding a component to the build
-# process, you need only edit this line, and change the 
-# external variable names---go home early today !
-# if we wanted to get really smart ass, we could use computed
-# variable names. Hmm...
-sh_component_name:=smartheap6
-# define the paths to the component parts
-sh_path_root:=$(NSCP_DISTDIR)/$(sh_component_name)
-sh_components_share=/share/builds/components/$(sh_component_name)
-sh_release_config:=$(sh_components_share)/$(SH_VERSION)/$(NSCONFIG)$(NSOBJDIR_TAG)
-SH_INCLUDE:=$(sh_path_root)/include
-SH_LIBPATH:=$(sh_path_root)/lib
-# hack below because I couldn't find this defined anywhere in the nsxxx.mk headers
-ifeq ($(ARCH), WINNT)
-sh_import_lib_suffix:=$(LIB_SUFFIX)
-SH_LIB:=$(SH_LIBPATH)/shdsmpmt.$(sh_import_lib_suffix)
-SH_STATIC_LIB:=$(SH_LIBPATH)/shlsmpmt.$(LIB_SUFFIX)
-SH_LIB_DEP:=$(SH_STATIC_LIB)
-else
-sh_import_lib_suffix:=$(DLL_SUFFIX)
-#This needed to get the libraries initialized in the correct order for Solaris C++ code
-ifeq ($(ARCH), SOLARIS)
-SH_LIB:=-L$(SH_LIBPATH) -lsh -lc
-else
-#LA 05/16/01: add C++ smartheap library/test for HPUX
-  ifeq ($(ARCH), HPUX)
-    SH_LIB:=-L$(SH_LIBPATH) -lsh -lsmartheapC_smp
-  else
-    SH_LIB:=-L$(SH_LIBPATH) -lsh
-  endif
-endif
-SH_STATIC_LIB:=-L$(SH_LIBPATH) -lshs
-SH_LIB_DEP:=$(SH_LIBPATH)/libshs.a
-endif
-
-ifeq ($(ARCH), WINNT)
-#Install smartheap dll in the server binary directory
-ifeq ($(DEBUG), optimize)
-PACKAGE_SRC_DEST += $(SH_LIBPATH)/libsh.$(DLL_SUFFIX) bin/slapd/server
-endif
-endif
-
-# add ",bin" to DB_FILES if you want the programs
-SH_FILES=include,lib
-
-ifndef SH_PULL_METHOD
-SH_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SH_LIB_DEP): $(NSCP_DISTDIR)
-	$(FTP_PULL) -method $(SH_PULL_METHOD) \
-		-objdir $(sh_path_root) -componentdir $(sh_release_config) \
-		-files $(SH_FILES)
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component $(sh_component_name) file $@" ; \
-	fi
diff --git a/nsconfig.mk b/nsconfig.mk
deleted file mode 100644
index cb1eb7c2..00000000
--- a/nsconfig.mk
+++ /dev/null
@@ -1,1598 +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
-#
-#
-# nsconfig.h: determines which product is being built, how, and for what 
-# arch
-#
-# Rob McCool
-
-# This is the default target for all Makefiles which include this file.
-# Those Makefiles should define this target with the appropriate dependencies
-# and build rules.
-#
-# More comment
-all:
-
-
-ABS_ROOT := $(shell cd $(BUILD_ROOT); pwd)
-ABS_ROOT_PARENT := $(shell cd $(ABS_ROOT)/..; pwd)
-MAKE=gmake $(BUILDOPT)
-
-# 7/12/96 Adrian - allow MAKEFLAGS to propagate
-# override MAKEFLAGS := 
-
-# all of these things are on by default for internal builds
-ifdef INTERNAL_BUILD
-	USE_ADMINSERVER:=0
-	USE_CONSOLE:=0
-	USE_DSMLGW:=0
-	USE_ORGCHART:=0
-	USE_DSGW:=0
-	USE_JAVATOOLS:=0
-	USE_SETUPUTIL:=0
-	USE_PERLDAP:=1
-else
-	USE_ADMINSERVER:=0
-	USE_CONSOLE:=0
-	USE_DSMLGW:=0
-	USE_ORGCHART:=0
-	USE_DSGW:=0
-	USE_JAVATOOLS:=0
-	USE_SETUPUTIL:=0
-	USE_PERLDAP:=0
-	GET_JAVA_FROM_PATH := 1
-	GET_ANT_FROM_PATH := 1
-	USE_PERL_FROM_PATH := 1
-	BUILD_JAVA_CODE := 0
-endif
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/component_versions.mk
-
-# It looks like most of the latest versions of Unix that we ship on
-# have a good enough heap implementations that they don't need 
-# SmartHeap.  We still need it on NT and HPUX.
-# Solaris 8 and later has mtmalloc
-# By contract HPUX must be aligned with Solaris.
-ifneq ($(ARCH), SOLARIS)
-ifneq ($(ARCH), WINNT)
-ifneq ($(ARCH), HPUX)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-endif
-endif
-
-ifeq ($(ARCH), HPUX)
-  ifeq ($(NSOS_TEST1),ia64)
-    LDAP_DONT_USE_SMARTHEAP=1
-    ifeq ($(DEBUG), optimize)
-      CFLAGS+=+O3
-    endif
-  endif
-endif
-
-# Don't use smartheap for debug builds
-ifeq ($(DEBUG), full)
-LDAP_DONT_USE_SMARTHEAP=1
-endif
-
-ifeq ($(SECURITY), domestic)
-  SEC_SUFFIX = D
-else
-  SEC_SUFFIX = E
-endif
-
-PRETTY_ARCH := $(shell uname -s)
-
-NSOS_ARCH         := $(subst /,_,$(shell uname -s))
-
-ifneq ($(NO_BUILD_NUM), true)
-  GET_BUILD_NUM := $(shell cat $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat)
-endif
-
-ifeq ($(NSOS_ARCH), IRIX64)
-  NSOS_ARCH := IRIX
-endif
-
-# Default
-NSOS_RELEASE      := $(shell uname -r)
-NSOS_RELEASE_NOTAG = $(NSOS_RELEASE)
-
-# Check if we're on RHEL
-ifeq ($(NSOS_ARCH), Linux)
-  NSOS_TEST := $(shell cat /etc/redhat-release)
-  ifeq ($(findstring Taroon,$(NSOS_TEST)),Taroon)
-    NSOS_ARCH := RHEL
-    NSOS_RELEASE := 3
-    # Always use gcc on RHEL
-    GCC_VERSION := gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
-  else
-  ifeq ($(findstring Nahant,$(NSOS_TEST)),Nahant)
-      NSOS_ARCH := RHEL
-      NSOS_RELEASE := 4
-      # Always use gcc on RHEL
-      GCC_VERSION := gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
-  endif
-  endif
-endif
-
-ifeq ($(NSOS_ARCH), AIX)
- NSOS_TEST        := $(shell uname -v)
- ifeq ($(NSOS_TEST),3)
-   NSOS_RELEASE   := $(shell uname -r)
- else
-   NSOS_RELEASE   := $(shell uname -v).$(shell uname -r)
- endif
-endif
-
-# Get OSF's OS revision number to figure out the OS release 
-ifeq ($(NSOS_ARCH),OSF1)
-  NSOS_OSF1REV    := $(shell uname -v)
-  ifeq ($(NSOS_OSF1REV),878)
-    NSOS_TAG := D
-  else
-    ifeq ($(NSOS_OSF1REV),564)
-      NSOS_TAG := B
-    else
-      ifeq ($(NSOS_OSF1REV),464)
-        NSOS_TAG := A
-      else
-# Grenoble: Defaulting to release D since these are the only version of components we have so far.
-        NSOS_TAG := D
-      endif
-    endif
-  endif
-  NSOS_RELEASE_NOTAG := $(NSOS_RELEASE)
-  NSOS_RELEASE := $(NSOS_RELEASE_NOTAG)$(NSOS_TAG)
-else
-  NSOS_RELEASE_NOTAG := $(NSOS_RELEASE)
-endif
-
-# IRIX: Recommond: USE_PTHREADS=1 and USE_N32=1
-ifeq ($(NSOS_ARCH), IRIX)
- ifeq ($(USE_PTHREADS), 1)
-  ifeq ($(USE_N32), 1)
-   NSOS_RELEASE := $(shell uname -r)_n32_PTH
-  else
-   NSOS_RELEASE := $(shell uname -r)_PTH
-  endif
- endif
- NSOS_RELEASE_NOTAG := $(shell uname -r)
-endif
-
-# SVR5 (UnixWare7)
-ifeq ($(NSOS_ARCH),UnixWare)
-# For now get the OS release for backward compatibility (UnixWare5)
-NSOS_RELEASE    := $(shell uname -r)
-endif
-
-# Catch NCR butchering of SVR4
-ifeq ($(NSOS_ARCH),UNIX_SV)
-ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),)
-NSOS_ARCH       := NCR
-PRETTY_ARCH     := NCR
-else # !NCR
-# Make UnixWare something human readable
-NSOS_ARCH       := UNIXWARE
-PRETTY_ARCH     := UNIXWARE
-endif # !NCR
-# Check for UW2 using UDK, which looks like a Gemini (UnixWare7) build
-NSOS_RELEASE    := $(shell $(BUILD_ROOT)/nsarch -f | sed 's/UnixWare //')
-ifeq ($(NSOS_RELEASE),5)
-NSOS_ARCH       := UnixWare
-else # NSOS_RELEASE = 5
-# Get the OS release number, not 4.2
-NSOS_RELEASE    := $(shell uname -v)
-ifeq ($(NSOS_RELEASE),2.1.2)
-# so we don't need yet another set of duplicate UNIXWARE$VER.mk gmake files
-NSOS_RELEASE    := 2.1
-endif # NSOS_RELEASE = 2.1.2
-endif # NSOS_RELEASE = 5
-endif # UNIX_SV
-
-# Clean up SCO
-ifeq ($(NSOS_ARCH),SCO_SV)
-NSOS_ARCH	:= SCOOS
-ifeq (5.0,$(findstring 5.0,$(shell ls /var/opt/K/SCO/Unix)))
-NSOS_RELEASE	:= 5.0
-else
-NSOS_RELEASE	:= UNKNOWN
-endif
-endif
-
-# both values (SINIX-N and ReliantUNIX-N) are possible
-ifeq ($(NSOS_ARCH), SINIX-N)
-NSOS_ARCH     := ReliantUNIX
-PRETTY_ARCH   := ReliantUNIX
-NSOS_RELEASE  := 5.4
-endif
-ifeq ($(NSOS_ARCH), ReliantUNIX-N)
-NSOS_ARCH     := ReliantUNIX
-PRETTY_ARCH   := ReliantUNIX
-NSOS_RELEASE  := 5.4
-endif
-
-# Make NT versions 5.1 and 5.2 look like 5.0 for build purposes
-ifndef NSOS_RELEASE_OVERRIDE
-ifeq ($(NSOS_ARCH),WINNT)
-ifeq ($(NSOS_RELEASE),5.1)
-NSOS_RELEASE_OVERRIDE=5.0
-endif
-ifeq ($(NSOS_RELEASE),5.2)
-NSOS_RELEASE_OVERRIDE=5.0
-endif
-endif
-endif
-
-ifdef NSOS_RELEASE_OVERRIDE
-NSOS_RELEASE_NOTAG  := $(NSOS_RELEASE_OVERRIDE)
-NSOS_RELEASE := $(NSOS_RELEASE_NOTAG)$(NSOS_TAG)
-endif
-
-ifeq ($(NSOS_ARCH),Linux)
-#
-# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 and 2.2.14-5.0smp
-#
-ifeq (,$(filter-out Linux FreeBSD,$(NSOS_ARCH)))
- NSOS_RELEASE  := $(shell echo $(NSOS_RELEASE) | sed 's/-.*//')
-endif 
-NSOS_RELEASE_TEMP := $(subst ., ,$(NSOS_RELEASE))
-NSOS_RELEASE_COUNT := $(words $(NSOS_RELEASE_TEMP))
-ifeq ($(NSOS_RELEASE_COUNT), 4)
-	NSOS_RELEASE := $(basename $(NSOS_RELEASE))
-endif
-NSOS_RELEASE := $(basename $(NSOS_RELEASE))
-NSOS_ARCH       := Linux
-PRETTY_ARCH     := Linux
-endif
-
-NSOS_TEST1       := $(shell uname -m)
-ifeq ($(NSOS_ARCH),Linux)
-  ifneq (x86_64, $(NSOS_TEST1))
-    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-      NSOS_TEST1    = x86
-    endif
-  endif
-
-  ifeq ($(USE_LIBC),1)
-    LIBC_VERSION  = _libc
-  else
-    LIBC_VERSION  = _glibc
-  endif
-  USE_PTHREADS = 1
-  ifeq ($(USE_PTHREADS),1)
-    PTHREAD_TAG   = _PTH
-  endif
-  NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(LIBC_VERSION)$(PTHREAD_TAG)
-  NSCONFIG_NOTAG  = $(NSCONFIG)
-else
-  ifeq ($(NSOS_ARCH),RHEL)
-    ifneq (x86_64, $(NSOS_TEST1))
-      ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-        NSOS_TEST1    = x86
-      endif
-    endif
-    NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
-    NSCONFIG_NOTAG  = $(NSCONFIG)
-  else
-    ifeq ($(NSOS_ARCH),HP-UX)
-      NSOS_TEST1       := $(shell uname -m)
-      ifeq ($(NSOS_TEST1), ia64)
-        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
-        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
-      else
-        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
-        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
-      endif
-    else
-    ifeq ($(NSOS_TEST1),i86pc)
-      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
-      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
-    else
-      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
-      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
-    endif
-    endif
-  endif
-endif
-
-ifeq ($(DEBUG), full)
-  MCC_DEBUG=-DMCC_DEBUG $(ARCH_DEBUG)
-  NSOBJDIR_TAG=_DBG
-  ML_DEBUG=$(ARCH_LINK_DEBUG)
-else
-ifeq ($(DEBUG), purify)
-  MCC_DEBUG=$(ARCH_DEBUG)
-  NSOBJDIR_TAG=_DBG
-  ML_DEBUG=$(ARCH_LINK_DEBUG)
-  PUREOPTS=-follow-child-processes=true -check-debug-timestamps=no -best-effort
-  PURIFY=purify $(PUREOPTS)
-else
-ifeq ($(DEBUG), quantify)
-  MCC_DEBUG=$(ARCH_DEBUG)
-  NSOBJDIR_TAG=_DBG
-  ML_DEBUG=$(ARCH_LINK_DEBUG)
-  QUANOPTS=-follow-child-processes=true -check-debug-timestamps=no -best-effort
-  QUANTIFY=quantify $(QUANOPTS)
-  USE_QUANTIFY=1
-else
-  MCC_DEBUG=$(ARCH_OPT)
-  NSOBJDIR_TAG=_OPT
-  ML_DEBUG=$(ARCH_LINK_OPT)
-  BUILDOPT = BUILD_OPT=1
-endif
-endif
-endif
-
-ifeq ($(NSOS_ARCH),WINNT)
-  ifneq ($(PROCESSOR_ARCHITECTURE),x86)
-    NSOBJDIR_NAME     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
-    NSOBJDIR_NAME_32     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
-  else
-    NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-    NSOBJDIR_NAME_32     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  endif
-else
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_32  = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
-  NSOBJDIR_NAME1    = $(NSOBJDIR_NAME)
-endif
-
-
-# Where to put component packages (libs, includes) to build against and package
-NSCP_DIST	=  $(BUILD_ROOT)/../dist
-NSCP_DISTDIR          = $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
-
-MAKE=gmake $(BUILDOPT) NO_JAVA=1
-
-LWDEFS = LIVEWIRE=1
-JSDEFS = JSFILE=1 JS_THREADSAFE=1
-
--include ../lw/config/netsite-config.mk
-
-NSDEFS=SERVER_BUILD=1 XCFLAGS=$(MCL_CFLAGS) USE_PTHREADS=$(USE_PTHREADS) \
-       NS_PRODUCT=$(NS_PRODUCT) VERSION=$(SERVER_VERSION) \
-       NS_USE_NATIVE=$(NS_USE_NATIVE) NSPR_BASENAME=$(NSPR_BASENAME)
-
-NSPR_DEFINES = -DSERVER_BUILD
-
-
-# Destination for class files and packages
-CLASS_DEST        = $(NSCP_DIST)/classes
-
-# ----------- Where to get shared components --------------------
-# COMPONENTS_DIR_DEV can be used to pull stuff from the integration area
-# at rtm time we switch it over to use the official components
-
-ifndef COMPONENTS_DIR_DEV
-COMPONENTS_DIR_DEV = /share/builds/sbsintegration
-endif
-
-# internal repository for all pre-built RTM components, including Red Hat branded ones
-ifndef COMPONENTS_DIR
-COMPONENTS_DIR = /share/builds/components
-endif
-
-# internal repository for pre-built RTM Fedora branded components
-ifndef FED_COMPONENTS_DIR
-FED_COMPONENTS_DIR = /fedora/components
-endif
-
-###########################################################
-
-
-# ------------------------ Product-specific flags ------------------------
-
-
-ifdef PRODUCT_IS_DIRECTORY_SERVER
-  ifeq ($(SECURITY), export)
-    MCC_SERVER=-DNS_EXPORT $(NSPR_DEFINES)
-  endif
-  ifeq ($(SECURITY), domestic)
-    MCC_SERVER=$(NSPR_DEFINES)
-  endif
-  ifeq ($(SECURITY), none)
-    MCC_SERVER=-DNS_UNSECURE $(NSPR_DEFINES)
-  endif
-  DS_SERVER_DEFS =
-  ifeq ($(BUILD_DEBUG),full)
-    MODULE_CFLAGS += -DDEBUG
-  endif
-  MCC_SERVER += $(DS_SERVER_DEFS)
-  NS_PRODUCT = DIRECTORY_SERVER
-  ifeq ($(LDAP_NO_LIBLCACHE),1)
-    MODULE_CFLAGS+=-DNO_LIBLCACHE
-  endif
-endif
-
-MCC_SERVER += -DBUILD_NUM=$(GET_BUILD_NUM)
-
-# ----------- Default Flags, may be overridden below ------------
-
-PEER_DATE=19980121
-CPPCMD=$(CC) -E
-HTTPDSO_NAME=$(BUILD_HTTPDLL_NAME)
-MATHLIB=-lm
-LIB_SUFFIX=a
-AR=ar rcv $@
-DLL_PRESUF=
-DLL_SUFFIX=so
-LDAP_DLL_PRESUF=
-LDAP_DLL_SUFFIX=$(DLL_SUFFIX)
-LINK_DLL=ld $(DLL_LDFLAGS) -o $@
-LINK_PLUGIN=$(LINK_DLL)
-
-# ---------------------- OS-specific compile flags -----------------------
-
-
-# Used by peer snmp defines below
-DEVROOT = $(BUILD_ROOT)/peer
-
-ifeq ($(ARCH), AIX)
-# convert the output of oslevel to a 4 digit number
-# e.g. 4.2.0.0 -> 4200  4.2.1.0 -> 4210
-OSVERSION := $(shell oslevel | sed "s/[.]//g")
-OSMAJORVERSION := $(shell oslevel | cut -f1 -d.)
-OSMINORVERSION := $(shell oslevel | cut -f2 -d.)
-# we had to do a lot of special stuff to make shared libraries work 
-ifeq ("yes", $(shell /bin/sh -c "[ $(OSVERSION) -lt 4200 ] && echo yes" ) )
-	OLD_AIX_LINKING=1
-endif
-
-ifdef OLD_AIX_LINKING
-	DLL_PRESUF=_shr
-	DLL_SUFFIX=a
-else
-# there is apparently a lot of stuff to do before we can use .so as the
-# shared library suffix, so leave it for now . . .
-	DLL_PRESUF=
-	DLL_SUFFIX=so
-	LD=xlC_r
-endif
-
-#CC=xlC_r -qinfo -qarch=com -qgenpcomp=$(OBJDIR)/.pcomp -qusepcomp -DAIX -DAIXV3 -DAIXV4 -DSYSV -DOSVERSION=$(OSVERSION)
-CC=xlC_r -qinfo -qarch=com -DAIX -DAIXV3 -DAIXV4 -DSYSV -DOSVERSION=$(OSVERSION) -DAIX$(OSMAJORVERSION)_$(OSMINORVERSION)
-CCC=$(CC)
-CXX=$(CC)
-CPPCMD=/usr/ccs/lib/cpp -P
-ARCH_DEBUG=-g -qfullpath
-ARCH_OPT=-O
-RANLIB=ranlib
-SHARED_FLAG=-brtl
-NONSHARED_FLAG=-bnso -bI:/lib/syscalls.exp
-EXPORT_FILE=$*.exp
-DEF_LIBPATH=/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-# JCM - LINK_PLUGIN+=-berok
-ifdef OLD_AIX_LINKING
-	MKSHLIB_FLAGS=-p 0 -blibpath:$(DEF_LIBPATH)
-	DLL_LDFLAGS=-bM:SRE -bnoentry -blibpath:$(DEF_LIBPATH)
-	LINK_DLL=$(BUILD_ROOT)/build/aixmkshlib -o $@ $(MKSHLIB_FLAGS)
-	MKSHLIB=$(LINK_DLL)
-	EXTRA_LIBS=-lsvld
-else
-	MKSHLIB_FLAGS=-brtl -p 0 -blibpath:$(DEF_LIBPATH)
-	DLL_LDFLAGS=-bM:SRE -bnoentry -blibpath:$(DEF_LIBPATH)
-	LINK_DLL=/usr/lpp/xlC/bin/makeC++SharedLib_r -o $@ $(MKSHLIB_FLAGS)
-	ifeq ($(OSMAJORVERSION), 4)
-	  ifeq ($(OSMINORVERSION), 3)
-	    LINK_DLL=/usr/ibmcxx/bin/makeC++SharedLib_r -o $@ $(MKSHLIB_FLAGS)
-	  endif
-	endif
-	MKSHLIB=$(LINK_DLL)
-	EXTRA_LIBS=-ldl
-endif
-#LINK_DLL=$(LD) $(DLL_LDFLAGS)  -o $@
-# AIX plugins can have unresolved references
-ifdef PRODUCT_IS_DIRECTORY_SERVER
-EXTRA_LIBS += -lpthreads -lc_r -lm
-endif
-
-VERITY_ARCH=_rs6k41
-NSAPI_CAPABLE=true
-USE_PTHREADS=1
-ifdef OLD_AIX_LINKING
-	DL_LIB =-lsvld
-else
-	DL_LIB =-ldl
-endif
-RWTOOLS_VERSION = latest
-#HTTPDSO_NAME=libdsnshttpd
-PEER_ARCH=aix
-
-else
-ifeq ($(ARCH), BSDI)
-
-CC=cc
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ARCH_CFLAGS=-Wall -DNO_GETDOMAINNAME
-RANLIB=ranlib
-NONSHARED_FLAG=-static
-PEER_ARCH=bsdi
-
-else 
-ifeq ($(ARCH), HPUX)
-ifeq ($(NSOS_TEST1), ia64)
-DLL_SUFFIX=so
-else
-DLL_SUFFIX=sl
-endif
-#-D_POSIX_C_SOURCE=199506L turns kernel threads on for HPUX11
-CC=cc -Ae -D_POSIX_C_SOURCE=199506L
-ifeq ($(BUILD_MODULE), HTTP_ADMIN)
-ifeq ($(NSOS_RELEASE),B.11.23)
-# -AA -- new-lib libstd 2
-CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
-else
-CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
-endif
-else
-ifeq ($(NSOS_RELEASE),B.11.23)
-# -AA -- new-lib libstd 2
-CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
-else
-CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
-endif
-endif
-CCC=$(CXX)
-ARCH_DEBUG=-g
-ifeq ($(NSOS_RELEASE),B.11.23)
-# optimization level changes actually is due to the aCC changes,
-# it is applicable to 11i v1 also, but conditional compile here
-# anyway.
-ARCH_OPT=+O3
-else
-ARCH_OPT=-O
-endif
-# Compile everything pos-independent in case we need to put it in shared lib
-ifeq ($(NSOS_RELEASE),B.11.23)
-ifdef USE_64
-  ARCH_CFLAGS=-D_HPUX_SOURCE +DD64 +DSblended +Z
-else
-  ARCH_CFLAGS=-D_HPUX_SOURCE +DD32 +DSblended +Z
-endif
-else
-ifdef USE_64
-  ARCH_CFLAGS=-D_HPUX_SOURCE +DA2.0W +DS2.0 +Z
-else
-  ARCH_CFLAGS=-D_HPUX_SOURCE +DAportable +DS1.1 +Z
-endif
-endif
-# NSPR uses fpsetmask which I'm told is in the math lib
-EXTRA_LIBS= -ldld -lm
-ifeq ($(NSOS_RELEASE), B.10.10)
-ARCH_CFLAGS+=-DHPUX10 -DHPUX10_10
-# Debug with HPUX "dde" - makes the server single process - avoids fork()ing.
-# Can also be used for non HPUX if desired.
-#ARCH_CFLAGS+=-DUSE_DDE_DEBUG
-EXTRA_LIBS += -ldce
-else
-
-ifeq ($(NSOS_RELEASE), B.11.00)
-	MODERNHP=1
-endif
-
-ifeq ($(NSOS_RELEASE), B.11.11)
-	MODERNHP=1
-endif
-
-ifeq ($(NSOS_RELEASE), B.11.23)
-	MODERNHP=1
-endif
-
-ifeq ($(MODERNHP), 1)
-ifeq ($(NSOS_RELEASE), B.11.00)
-	ARCH_CFLAGS+=-DHPUX11 -DHPUX11_00
-endif
-ifeq ($(NSOS_RELEASE), B.11.11)
-	ARCH_CFLAGS+=-DHPUX11 -DHPUX11_11
-endif
-ifeq ($(NSOS_RELEASE), B.11.23)
-	ARCH_CFLAGS+=-DHPUX11 -DHPUX11_11
-endif
-# Debug with HPUX "dde" - makes the server single process - avoids fork()ing.
-# Can also be used for non HPUX if desired.
-#ARCH_CFLAGS+=-DUSE_DDE_DEBUG
-EXTRA_LIBS+= -lpthread
-endif
-endif
-RANLIB=true
-NONSHARED_FLAG=-Wl,-a,archive
-
-# Flags passed to CC to pass onto the linker; separate it from EXTRA_LIBS 
-ifeq ($(USE_64),1)
-LD_CFLAGS=-W1,-E
-else
-LD_CFLAGS=-Wl,-E,-N
-endif
-DLL_CFLAGS=+Z
-DLL_LDFLAGS=-b
-NSAPI_CAPABLE=true
-VERITY_ARCH=_hp800
-USE_PTHREADS=1
-NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
-LINK_DLL=$(CCC) $(DLL_LDFLAGS) $(ARCH_CFLAGS) -o $@
-PEER_ARCH=hp
-RWTOOLS_VERSION = latest
-
-else 
-ifeq ($(ARCH), IRIX)
-OSVERSION := $(shell uname -r)
-# the ns/ side of the fence assumes SVR4 is defined. --Rob
-CC=cc -DSVR4
-ifndef PRODUCT_IS_DIRECTORY_SERVER
-CXX=CC -DSVR4 -exceptions
-else
-# XXXmcs: 17-Sep-1997 - the -exceptions flag causes the IRIX CC compiler
-# to dump core when compiling ldapserver/lib/safs/aclsafs.c
-# We don't seem to need this for Directory Server....
-CXX=CC -DSVR4
-endif
-CCC=$(CXX)
-ARCH_DEBUG=-g
-ARCH_OPT=-O
-ifeq ($(USE_N32), 1)
- ARCH_CFLAGS=-fullwarn -use_readonly_const -MDupdate .depends -n32
-else
- ARCH_CFLAGS=-fullwarn -use_readonly_const -MDupdate .depends -o32
-endif
-RANLIB=true
-DLL_LDFLAGS=-shared
-NONSHARED_FLAG=-non_shared
-NLIST=-lmld
-NSAPI_CAPABLE=true
-# Use -DIRIX6_2 for 6.x
-ifeq (6.,$(findstring 6.,$(OSVERSION)))
-ARCH_CFLAGS+=-DIRIX6_2
-endif
-ifeq (6.5,$(OSVERSION))
-ARCH_CFLAGS+=-DIRIX6_5 -mips3
-endif
-NSPR_DEFINES += -D_PR_NTHREAD -D_SGI_MP_SOURCE
-
-LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@
-PEER_ARCH=irix
-
-export NO_DB2=1
-
-else 
-ifeq ($(ARCH), Linux)
-OSVERSION	:= $(basename $(shell uname -r))
-CC=/usr/bin/gcc
-CXX=/usr/bin/g++
-CCC=$(CXX)
-LD=$(CXX)
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ARCH_CFLAGS=-Wall -DNO_DBM -DLINUX -DLINUX2_2 -DLINUX2_4 -fPIC -D_REENTRANT
-RANLIB=ranlib
-DLL_LDFLAGS=-shared
-LINK_DLL=$(CC) $(DLL_LDFLAGS) -o $@
-NLIST=-lelf
-NSAPI_CAPABLE=true
-EXTRA_LIBS=-ldl -lcrypt -lpthread
-BUILD_IIOPLIB=no
-ifeq (2.4,$(OSVERSION))
-PEER_ARCH=linux2.4
-else
-PEER_ARCH=linux
-endif
-# linux always uses pthreads
-USE_PTHREADS = 1
-# remove this line when smartheap is built for linux
-LDAP_DONT_USE_SMARTHEAP = 1
-
-else
-ifeq ($(ARCH), UNIXWARE)
-
-CC=$(BUILD_ROOT)/build/hcc
-CXX=$(BUILD_ROOT)/build/hcpp
-CCC=$(CXX)
-CPPCMD=/lib/cpp -P
-ARCH_DEBUG=-g
-ARCH_OPT=
-ARCH_CFLAGS=
-RANLIB=true
-NLIST=-lelf
-NSAPI_CAPABLE=true
-
-# to use native threads - uncomment this
-# export USE_SVR4_THREADS=1
-
-# The -lgen is for syslog.
-
-ifdef USE_SVR4_THREADS
-OS_THREADLIB = -lthread
-endif
-
-EXTRA_LIBS=-lsocket -lnsl -lresolv -ldl -lgen -lC -lc /usr/ucblib/libucb.a $(OS_THREADLIB)
-# extra libs because svr4 doesn't support sockets the way we want...?
-DLL_LDFLAGS=-d y -G
-USE_LD_RUN_PATH=true
-LDAP_VERSION = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-NEED_VTASKSTUB = 1
-NO_MSOFT_OBJ=1
-BUILD_WEBPUB=no
-BUILD_IIOPLIB=no
-PEER_ARCH=unixware
-
-export NO_INFORMIX=1
-export NO_ORACLE=1
-export NO_SYBASE=1
-export NO_ODBC=1
-export NO_DB2=1
-
-else
-ifeq ($(ARCH), UnixWare)
-# We don't want to use absolute paths here, because we might want to pickup
-# UDK tools from /udk/usr/ccs, so we depend on the PATH being correctly set
-CC=cc
-CCC=CC
-CXX=$(CCC)
-CPPCMD=/lib/cpp -P
-ARCH_DEBUG=-g
-ARCH_OPT=-O
-SV_REL := $(shell uname -r)
-# SVR5 if Gemini UnixWare
-# SVR4 if UnixWare 2.1.x with the UDK tools
-ifeq ($(SV_REL),5)
-  ARCH_CFLAGS=-DSVR5 -D_SIMPLE_R
-else
-  ARCH_CFLAGS=-DSVR4 -D_SIMPLE_R
-endif
-RANLIB=true
-NLIST=-lelf
-NSAPI_CAPABLE=true
-
-# to use native threads - uncomment this
-# export USE_SVR4_THREADS=1
-
-ifdef USE_SVR4_THREADS
-OS_THREADLIB = -lthread
-endif
-
-# extra libs because svr4 doesn't support sockets the way we want...?
-EXTRA_LIBS=-lsocket -lnsl -lresolv -ldl -lgen -lC -lc /usr/ucblib/libucb.a
-$(OS_THREADLIB)
-LICENSE_LIBS=
-#LICENSE_LIBS=-lscolicense -lannot -li4clnt -li4shl -li4nsi -li4rpci\
-#                -lnck_task -lcps -lsocket /usr/ccs/lib/libC.a
-# extra libs because svr4 doesn't support sockets the way we want...?
-VERITY_LIB=_386svr4
-
-#If you comment the line below, you will turn off the SCO licensing.
-#This will allow you to use the server internally for test purposes.
-#MCC_SERVER += -DSCO_PM
-DLL_LDFLAGS=-d y -G
-#DLL_CFLAGS=-KPIC
-USE_LD_RUN_PATH=true
-LDAP10_VERSION = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-NEED_VTASKSTUB = 1
-NO_MSOFT_OBJ=1
-BUILD_WEBPUB=no
-BUILD_IIOPLIB=no
-PEER_ARCH=unixware5
-DB_VERSION=oem
-
-export NO_INFORMIX=1
-export NO_ORACLE=1
-export NO_SYBASE=1
-export NO_ODBC=1
-export NO_DB2=1
-
-else
-ifeq ($(ARCH), SCOOS)
-CC=cc -b elf -KPIC -DSCOOS
-CXX=g++ -b elf -DPRFSTREAMS_BROKEN -I/usr/local/lib/g++-include
-CCC=$(CXX)
-CPPCMD=/lib/cpp
-ARCH_DEBUG=-g
-ARCH_OPT=
-ARCH_CFLAGS=
-RANLIB=true
-NLIST=-lelf
-NSAPI_CAPABLE=true
-EXTRA_LIBS=-lsocket -lnsl -ldl -lpmapi -lc -lPW
-DLL_LDFLAGS=-d y -G
-
-VERITY_ARCH = _scoodt
-MCC_SERVER += -DSCO_PM
-DLL_LDFLAGS=-d y -G
-USE_LD_RUN_PATH=true
-LDAP_VERSION = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-BUILD_WEBPUB = no
-NO_MSOFT_OBJ = 1
-PEER_ARCH=sco
-
-else
-ifeq ($(ARCH), NCR)
-
-ABS_ROOT_PARENT := $(shell cd $(BUILD_ROOT)/..; pwd)
-
-NS_USE_GCC	= 1
-
-CPPCMD		= /lib/cpp
-ARCH_DEBUG	= -g
-ARCH_OPT	=
-ARCH_CFLAGS	=
-RANLIB		= true
-NLIST		= -lelf
-NSAPI_CAPABLE   = true
-
-ifdef NS_USE_GCC
-# if gcc-settings are redefined already - don't touch it
-#
-ifeq (,$(findstring gcc, $(CC)))
-CC      = gcc
-CCC     = g++
-CXX     = g++
-# always use -fpic - some makefiles are still broken and don't distinguish
-# situation when they build shared and static libraries
-ARCH_CFLAGS += -fpic -Wall -DPRFSTREAMS_BROKEN -DNS_USE_GCC $(GCC_FLAGS_EXTRA)
-CCC_EXTRA_LIBS  = -L/usr/local/lib -lstdc++ -lg++ -lgcc
-endif
-endif
-
-ifdef NS_USE_NATIVE
-CC              = cc
-CCC             = ncc
-CXX             = ncc
-ARCH_CFLAGS    += -DNS_USE_NATIVE
-CCC_EXTRA_LIBS  = -L/opt/ncc/lib
-endif
-
-###
-
-# order is important
-EXTRA_LIBS      = -lsocket -lnsl -lresolv -lgen -ldl $(CCC_EXTRA_LIBS) -lc /usr/ucblib/libucb.a
-GCC_FLAGS_EXTRA = -pipe
-
-DLL_LDFLAGS     = -d y -G
-VERITY_ARCH     = _isvr4
-USE_LD_RUN_PATH = true
-LDAP_VERSION    = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE     = oem
-ADM_VERSDIR 	= admserv35
-NEED_VTASKSTUB  = 1
-NO_MSOFT_OBJ	= 1
-AUTOCATALOG_VERSION = oem
-BUILD_WEBPUB    = no
-BUILD_IIOPLIB   = no
-DL_LIB          =-ldl
-# svr4-x86 compatible
-PEER_ARCH=unixware
-
-export NO_ODBC=1
-export NO_DB2=1
-
-else
-ifeq ($(ARCH), SONY)
-
-CC=cc
-ARCH_DEBUG=-g
-ARCH_OPT=
-ARCH_CFLAGS=
-RANLIB=true
-NLIST=-lelf
-NSAPI_CAPABLE=true
-EXTRA_LIBS=-lgen -lsocket -lnsl -ldl
-DLL_LDFLAGS=-G
-# extra libs because svr4 doesn't support sockets the way we want...
-
-LDAP_VERSION = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-
-else 
-ifeq ($(ARCH), NEC)
-
-CC=$(BUILD_ROOT)/build/hcc
-ARCH_DEBUG=-g
-ARCH_OPT=-KOlimit=4000
-ARCH_CFLAGS=-Xa
-RANLIB=true
-NLIST=
-NSAPI_CAPABLE=true
-EXTRA_LIBS=-lsocket -lnsl -ldl -lsdbm
-DLL_LDFLAGS=-G
-PEER_ARCH=nec
-LDAP_VERSION = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-
-else
-ifeq ($(ARCH), ReliantUNIX)
-
-# do not use DCE PTHREADS now
-# USE_PTHREADS = 1
-# do not use gcc anymore
-# NS_USE_GCC = 1
-
-DLL_LDFLAGS = -G
-
-ifdef NS_USE_GCC
-
-# gcc section
-CC=gcc
-CXX=gcc
-CCC=gcc
-LD=gld
-ARCH_DEBUG=-gdwarf
-ARCH_OPT=-O2
-ARCH_LDFLAGS=-Xlinker -Blargedynsym
-ARCH_CFLAGS=-pipe -DSVR4 -DSNI
-LINK_DLL=gld $(DLL_LDFLAGS) -o $@
-
-else
-
-# CDS++ section
-CC=cc
-CXX=CC -K old_for_init
-CCC=CC -K old_for_init
-CPPCMD=/usr/ccs/lib/cpp -P
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ARCH_LDFLAGS=-Wl,-Blargedynsym
-ARCH_CFLAGS=-DSVR4 -DSNI
-# we need to use $(CCC) if the .so contains C++ code
-# so in Makefiles where we want the .so to be linked with CC
-# we add a DLL_CC = $(CCC)
-LINK_DLL=$(DLL_CC) $(DLL_LDFLAGS) -o $@
-# otherwise, we just use $(CC)
-DLL_CC=$(CC)
-# There is another quirk: You cannot load .so's containing C++
-# code in an executable linked with $(CC)
-
-ifeq ($(USE_PTHREADS), 1)
-ARCH_CFLAGS += -K thread -DUSE_PTHREADS
-ARCH_LDFLAGS += -K thread
-DLL_LDFLAGS += -K thread
-endif
-
-endif
-
-RANLIB=true
-DLL_LDFLAGS=-G
-NONSHARED_FLAG=
-NLIST=-lelf
-NSAPI_CAPABLE=true
-VERITY_ARCH=_mipsabi
-NONSHARED_FLAG=
-EXTRA_LIBS=-lsocket -lnsl -lresolv -ldl -lgen -L/usr/local/lib -lsni
-USE_LD_RUN_PATH=true
-
-#LDAP_VERSION = latest
-#LDAP_RELDATE = latest
-LDAP_RELDATE = 20001119
-RWTOOLS_VERSION = latest
-# NEED_VTASKSTUB = 1
-
-#NO_MSOFT_OBJ=1
-BUILD_WEBPUB=yes
-BUILD_IIOPLIB=yes
-DO_AUTOCATALOG=yes
-DO_PKGAUTOCATALOG=yes
-
-#this is no longer needed
-#NEED_NSPR_MALLOC=yes
-
-PEER_ARCH=reliantunix
-RWTOOLS_VERSION = latest
-ADM_RELDATE = oem
-ADM_VERSDIR = admserv35
-AUTOCATALOG_VERSION = oem
-DB_VERSION=oem
-
-#export NO_INFORMIX=1
-#export NO_ORACLE=1
-export NO_SYBASE=1
-export NO_ODBC=1
-export NO_DB2=1
-
-else 
-ifeq ($(ARCH), OSF1)
-
-CC=cc
-CCC=cxx
-CXX=cxx
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ARCH_CFLAGS=-DIS_64 -DOSF1V4 -DOSF1V4$(NSOS_TAG) -ieee_with_inexact -pthread -std1
-# ranlib no longer needed on OSF1 V4.0 
-RANLIB=true
-DLL_LDFLAGS=-shared -all -expect_unresolved "*"
-NONSHARED_FLAG=-non_shared
-NSAPI_CAPABLE=true
-VERITY_ARCH=_aosf40
-ifdef PRODUCT_IS_DIRECTORY_SERVER
-#EXTRA_LIBS+=-lcxxstd -lcxx
-else
-#EXTRA_LIBS=-lcxxstd -lcxx
-endif
-USE_PTHREADS=1
-RWTOOLS_VERSION = latest
-PEER_ARCH=osf
-PEERDIR=$(DEVROOT)/osf/dev
-
-export NO_DB2=1
-export NO_ODBC=1
-
-else 
-ifeq ($(ARCH), SUNOS4)
-
-# Compile everything position-independent so we can put it into shared lib
-CC=gcc -fPIC
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ARCH_CFLAGS=-Wall -pipe
-RANLIB=ranlib
-DLL_CFLAGS=-fPIC
-DLL_LDFLAGS=-assert pure-text
-NONSHARED_FLAG=-static
-NSAPI_CAPABLE=true
-RESOLV_LINK=/usr/local/lib/libresolvPIC.a
-PEER_ARCH=sunos
-
-ifeq ($(RESOLV_FLAG), noresolv)
-EXTRA_LIBS=-ldl
-DNS_STUB_C=dns-stub.c
-DNS_STUB_O=dns-stub.o
-
-else
-EXTRA_LIBS=$(RESOLV_LINK) -ldl
-DNS_STUB_C=nis-stub.c
-DNS_STUB_O=nis-stub.o
-endif
-
-else
-ifeq ($(ARCH), SOLARIS)
-
-#
-# 7/12/96 Adrian - Switch to use SparcWorks for 3.0 Development
-#		   Therefore no need to separate from catalog server
-#
-OSVERSION := $(shell uname -r | sed "y/./0/")
-ifndef NS_USE_GCC
-NS_USE_NATIVE=1
-else
-CC=gcc
-CXX=g++
-CCC=$(CXX)
-endif
-ifdef NS_USE_NATIVE
-CC=cc -v
-CXX=CC +w
-CCC=$(CXX)
-LD=$(CC)
-endif
-ARCH_OPT=-xO2
-ARCH_CFLAGS=-DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DOSVERSION=$(OSVERSION)
-ifdef USE_64
-ifdef NS_USE_NATIVE
-  ARCH_CFLAGS += -xarch=v9
-else
-  ARCH_CFLAGS += -m64
-endif
-endif
-ifdef NS_USE_NATIVE
-  ARCH_CFLAGS += -KPIC
-else
-  ARCH_CFLAGS += -fPIC
-endif
-ARCH_DEBUG=-g
-RANLIB=true
-
-EXTRA_LIBS = -lthread -lposix4 -lsocket -lnsl -ldl -lresolv -lw
-ifdef PRODUCT_IS_DIRECTORY_SERVER
-EXTRA_LIBS += -lgen
-endif
-
-DLL_LDFLAGS=-G
-NONSHARED_FLAG=-static
-NSAPI_CAPABLE=true
-NLIST=-lelf
-VERITY_ARCH=_solaris
-NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
-PEER_ARCH=solaris
-ifndef NS_USE_NATIVE
-NSPR_DEFINES += -DSOLARIS_GCC
-endif
-
-# XXXrobm BARF
-# ifeq ($(NSOS_RELEASE), 5.3)
-# GCCLIB=/usr/local/lib/gcc-lib/sparc-sun-solaris2.3/2.6.3/libgcc.a
-GCCLIB=
-# We are using a CC compiler but we were linking to libgcc.a - should use sparcworks libC
-#GCCLIB=/tools/ns-arch/sparc_sun_solaris2.5/soft/sparcworks-3.0.1/run/default/share/lib/sparcworks/SUNWspro/SC3.0.1/lib/libC.a
-# else
-#	GCCLIB=/usr/local/lib/gcc-lib/sparc-sun-solaris2.4/2.6.3/libgcc.a
-# endif
-
-else
-ifeq ($(ARCH), SOLARISx86)
-OSVERSION := $(shell uname -r | sed "y/./0/")
-NS_USE_NATIVE=1
-# Add SOLARIS define as well as SOLARISx86 which happens automagically
-CC=cc -DSOLARIS
-CXX=CC -DSOLARIS
-CCC=$(CXX)
-ARCH_OPT=-xO2
-ARCH_CFLAGS=-DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DOSVERSION=$(OSVERSION)
-ARCH_DEBUG=-g
-RANLIB=true
-
-EXTRA_LIBS = -lsocket -lthread -lposix4 -lnsl -ldl -lresolv -lm -lw
-
-DLL_LDFLAGS=-G
-#LDAP_VERSION    = oem
-RWTOOLS_VERSION = latest
-#ADM_RELDATE     = oem
-#ADM_VERSDIR = admserv30
-AUTOCATALOG_VERSION = oem
-#DB_VERSION=oem
-NONSHARED_FLAG=-static
-NSAPI_CAPABLE=true
-NLIST=-lelf
-NO_MSOFT_OBJ=1
-BUILD_WEBPUB=no
-BUILD_IIOPLIB=no
-NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
-export NO_INFORMIX=1
-export NO_ORACLE=1
-export NO_SYBASE=1
-export NO_ODBC=1
-export NO_DB2=1
-PEER_ARCH=solarisx86
-
-else
-ifeq ($(ARCH), WINNT)
-ifdef DEBUG_RUNTIME
-RTFLAG=-MDd
-else
-RTFLAG=-MD
-endif
-LIB_SUFFIX=lib
-DLL_SUFFIX=dll
-PROCESSOR := $(shell uname -p)
-PEER_ARCH=nti31
-ifeq ($(PROCESSOR), I386)
-CPU_ARCH = x386
-VERITY_ARCH=_nti31
-ARCH_OPT=-DNDEBUG -O2
-CC=cl -nologo $(RTFLAG) -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo $(RTFLAG) -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_MBCS -D_AFXDLL -D_RWTOOLSDLL
-else 
-ifeq ($(PROCESSOR), MIPS)
-CPU_ARCH = MIPS
-VERITY_ARCH=verity_is_undefined
-ARCH_OPT=-DNDEBUG -O2
-CC=cl -nologo $(RTFLAG) -W3 -GT -GX -D_MIPS_ -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo $(RTFLAG) -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_MBCS -D_AFXDLL -D_RWTOOLSDLL
-else 
-ifeq ($(PROCESSOR), ALPHA)
-CPU_ARCH = ALPHA
-VERITY_ARCH=_ant35
-ARCH_OPT=-DNDEBUG -Od
-CC=cl -nologo $(RTFLAG) -W3 -GT -GX -D_ALPHA=1 -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo $(RTFLAG) -W3 -GT -GX -D_ALPHA_ -DWIN32 -D_WINDOWS -D_MBCS -D_AFXDLL -D_RWTOOLSDLL
-BUILD_IIOPLIB=no
-export NO_SYBASE=1
-export NO_ODBC=1
-export NO_DB2=1
-else 
-CPU_ARCH = processor_is_undefined
-endif
-endif
-endif
-RC=rc $(MCC_SERVER)
-MC=mc
-ifdef HEAPAGENT
-OBJSWITCH=-Zi
-else
-OBJSWITCH=-Z7
-endif
-ARCH_DEBUG=-D_DEBUG -Od	$(OBJSWITCH)
-ARCH_CFLAGS=
-ARCH_LINK_DEBUG=-DEBUG
-ARCH_LINK_OPT=
-RANLIB=echo
-
-EXTRA_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
-           comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
-           rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib
-
-DLL_LDFLAGS=
-NONSHARED_FLAG=
-NSAPI_CAPABLE=true
-NO_MSOFT_OBJ=1
-NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU
-
-else
-
-CC=UNKNOWN_SYSTEM_TYPE
-
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-
-# Peer SNMP defines
-ifeq ($(BUILD_SNMP), yes)
-MCC_SERVER += -DPEER_SNMP
-SNMP=libsnmp
-SNMP_INCLUDE=$(DEVROOT)/include
-PEERLIB=$(DEVROOT)/$(PEER_ARCH)/dev
-SNMPNOLIB=snmp
-ifeq ($(ARCH), WINNT)
-PEERLIBOBJ=$(PEERLIB)/mgmt.lib
-else
-PEERLIBOBJ=$(PEERLIB)/mgmt.o
-endif
-else
-SNMP=
-SNMP_INCLUDE=.
-PEERLIB=
-PEERLIBOBJ=
-SNMPNOLIB=
-endif
-
-# ------------------------ The actual build rules ------------------------
-include $(BUILD_ROOT)/nsperl.mk
-
-RELTOOLSPATH = $(ABS_ROOT_PARENT)/reltools
-FTP_PULL = $(PERL) $(RELTOOLSPATH)/ftp_puller_new.pl -logdir $(ABS_ROOT_PARENT) -trimlog
-
-# make sure ftp puller exists
-$(RELTOOLSPATH)/ftp_puller_new.pl:
-	cd $(ABS_ROOT_PARENT) ; cvs co RelToolsLite
-
-# Define preferred pull method for the platform.
-# Can be overridden for the entire build, and also for each component
-# each component has an XXX_PULL_METHOD macro that defaults to the pull
-# method listed below; see components.mk
-ifndef COMPONENT_PULL_METHOD
-ifeq ($(ARCH), WINNT)
-COMPONENT_PULL_METHOD = FTP
-else
-COMPONENT_PULL_METHOD = SYMLINK
-endif
-endif
-
-# platforms without full rtl debugging versions of libraries i.e. not NT
-FULL_RTL_OBJDIR = $(NSOBJDIR_NAME)
-NSCP_DISTDIR_FULL_RTL = $(NSCP_DISTDIR)
-NSCP_ABS_DISTDIR_FULL_RTL = $(ABS_ROOT_PARENT)/dist/$(FULL_RTL_OBJDIR)
-
-FULL_RTL_OBJDIR_32 = $(NSOBJDIR_NAME_32)
-NSCP_DISTDIR_FULL_RTL_32 = $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME_32)
-NSCP_ABS_DISTDIR_FULL_RTL_32 = $(ABS_ROOT_PARENT)/dist/$(FULL_RTL_OBJDIR_32)
-
-# these components may have additional RTL debugging support built in on NT
-# adminutil, dbm, ldapsdk, NLS, NSPR, NSS (security)
-# we cannot simply redefine NSOBJDIR_NAME and NSCP_DISTDIR because other
-# components do not have this RTL support stuff and the .OBJD directory
-# does not exist
-ifeq ($(ARCH), WINNT)
-  ifeq ($(DEBUG), fulld)
-    FULL_RTL_OBJDIR=$(NSOBJDIR_NAME)D
-	NSCP_DISTDIR_FULL_RTL = $(BUILD_ROOT)/../dist/$(FULL_RTL_OBJDIR)
-	NSCP_ABS_DISTDIR_FULL_RTL = $(BUILD_ROOT)/../dist/$(FULL_RTL_OBJDIR)
-  endif
-endif
-
-$(NSCP_DISTDIR_FULL_RTL) $(CLASS_DEST): $(RELTOOLSPATH)/ftp_puller_new.pl
-	mkdir -p $@
-
-include $(BUILD_ROOT)/components.mk
-
-# these two macros are to fool the crazy NSPR nsinstall and fasttime
-# stuff into putting the objects and binaries in this location
-ABS_OBJDIR=$(ABS_ROOT)/built/$(NS_BUILD_FLAVOR)
-NSDEFS += DIST=$(NSPR_ABS_BUILD_DIR) OBJDIR=$(ABS_OBJDIR) \
-	FASTTIME_HEADER_DEST=$(ABS_OBJDIR)/include \
-	FASTTIME_TARGET_DEST=$(ABS_OBJDIR)
-# NT uses nsinstall.exe from the path
-ifneq ($(ARCH), WINNT)
-	NSDEFS += NSINSTALL=$(ABS_OBJDIR)/nsinstall
-endif
-
-##### FTP over AIX and HPUX since they are flakey over NFS ######
-#################################################################
-ifeq ($(ARCH), AIX)
-  FTP_UNIX=YES
-endif
-ifeq ($(ARCH), HPUX)
-  FTP_UNIX=YES
-endif
-################################################################
-
-#############################################################################
-# Pull the DS4.1 MCC package to get nsslapd.dll/.lib/.so for the DS ResKit
-# ONLY. Do not USE these macros for anything else 
-#############################################################################
-MCCBINARYDATE=19990621$(SEC_SUFFIX)
-FULLDSBINARY=$(COMPONENTS_DIR)/mcc41/$(MCCBINARYDATE)/$(NSOBJDIR_NAME)
-
-RM=rm
-DEPEND=makedepend
-
-ifeq ($(ARCH), IRIX)
-STRIP=strip -x
-else
-STRIP=strip
-endif # IRIX
-
-# XXXrobm The Sun MD stuff #includes stuff in the nspr dir without a prefix
-# Otherwise the second NSCP_DISTDIR/include/nspr would not be necessary
-MCC_INCLUDE=-I$(BUILD_ROOT)/include \
-            -I$(BUILD_ROOT)/include \
-            $(NSPR_INCLUDE) $(DBM_INCLUDE) $(SECURITY_INCLUDE) \
-            $(SVRCORE_INCLUDE) -I$(LDAP_INCLUDE) -I$(SASL_INCLUDE)
-
-ifeq ($(ARCH), WINNT)
-XP_FLAG=-DXP_WIN32  -DXP_WIN -D_WINDOWS -DXP_PC -DXP_WINNT
-else
-XP_FLAG=-DXP_UNIX
-endif
-# CFLAGS_NO_ARCH is needed temporarily by NS_MAIL
-CFLAGS_NO_ARCH=$(NODE_FLAG) $(BOMB) $(MODULE_CFLAGS) $(XP_FLAG) \
-       -D$(ARCH) $(MCC_DEBUG) $(MCC_SERVER)
-CFLAGS=$(ARCH_CFLAGS) $(CFLAGS_NO_ARCH)
-ifeq ($(BUILD_DLL), yes)
-CFLAGS += -DBUILD_DLL
-endif
-LFLAGS=$(ML_DEBUG)
-
-ifeq ($(BSCINFO), yes)
-CBSCFLAGS=-FR$(OBJDEST)/$*.sbr
-endif
-
-include $(BUILD_ROOT)/nscore.mk
-
-# These are the defaults, individual Makefiles can override them as necessary
-FVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-FVERSION_FLAGS=-v$(FVERSION)
-
-ifeq ($(ARCH), WINNT)
-$(OBJDEST)/%.res: %.rc 
-	$(RC) -I$(DIRVERDIR) -Fo$@ $*.rc
-endif
-
-ifdef USE_LINT
-LINT = lint
-LINTCFLAGS = -errchk=%all -u -F -errtags -errhdr -errfmt=simple -Nlevel=4 -Xarch=v9 -erroff=E_ASGN_NEVER_USED
-#no lint for c++ code on Solaris
-#LINTCCFLAGS = $(LINTCFLAGS)
-endif
-
-#ifndef NOSTDCOMPILE
-$(OBJDEST)/%.o: %.cc
-ifeq ($(ARCH), WINNT)
-	$(CCP) -c $(CCFLAGS) $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$*.o
-else
-	$(CCC) -c $(CCFLAGS) $(CFLAGS) $(MCC_INCLUDE) $< -o $(OBJDEST)/$*.o
-endif
-#endif
-
-ifndef NOSTDCOMPILE
-$(OBJDEST)/%.o: %.cpp
-ifeq ($(ARCH), WINNT)
-	$(CCP) -c $(CCFLAGS) $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$*.o
-else
-	$(CCC) -c $(CCFLAGS) $(CFLAGS) $(MCC_INCLUDE) $< -o $(OBJDEST)/$*.o
-endif
-endif
-
-ifndef NOSTDCOMPILE
-$(OBJDEST)/%.o: %.c
-ifeq ($(ARCH), WINNT)
-ifeq ($(BOUNDS_CHECKER), yes)
-	bcompile -c -Zop $(BUILD_ROOT)/bchecker.ini -nologo $(RTFLAG) -W3 -GT -GX -DWIN32 \
-	    -D_WINDOWS $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$*.o
-else
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$*.o $(CBSCFLAGS)
-endif
-else
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $< -o $(OBJDEST)/$*.o
-endif
-ifdef USE_LINT
-	$(LINT) $(LINTCFLAGS) $(subst -KPIC,,$(CFLAGS)) $(MCC_INCLUDE) $< > $(OBJDEST)/$*.ln 2>&1
-#	$(LINT) $(LINTCFLAGS) $(MODULE_CFLAGS) $(DEFS) $(MCC_SERVER) $(INCLUDES) $(MCC_INCLUDE) $< > $(OBJDEST)/$*.ln 2>&1
-endif
-endif
-
-ifeq ($(ARCH), WINNT)
-AR=lib /nologo /out:"$@"
-ifdef HEAPAGENT
-LDAP_DONT_USE_SMARTHEAP=true
-else
-PDBSWITCH=/PDB:NONE
-endif
-LINK_DLL	= link /nologo $(USE_MAP) /DLL $(PDBSWITCH) $(ML_DEBUG) /SUBSYSTEM:WINDOWS $(LLFLAGS) $(DLL_LDFLAGS) /out:"$@"
-LINK_EXE	= link -OUT:"$@" $(USE_MAP)  $(ARCH_LINK_DEBUG) $(LCFLAGS) /NOLOGO $(PDBSWITCH) /INCREMENTAL:NO \
-                  /SUBSYSTEM:windows $(OBJS) $(DEPLIBS) $(EXTRA_LIBS)
-BSCMAKE = bscmake.exe /nologo /o $@
-endif # WINNT
-
-ifndef NOSTDCLEAN
-clean:
-	$(RM) -f .depends $(LIBS) $(OBJDEST)/*.o *_pure_* $(BINS) $(PUREFILES)
-endif
-
-ifndef NOSTDDEPEND
-ifeq ($(ARCH), WINNT)
-INCLUDE_DEPENDS = $(NULL)
-depend:
-	echo making depends
-else
-INCLUDE_DEPENDS = .depends
-.depends:
-	touch .depends
-
-depend:
-	$(DEPEND) -f .depends -- $(MCC_INCLUDE) $(CFLAGS) *.c *.cpp
-endif
-endif
-
-ifndef NOSTDSTRIP
-strip:
-	$(STRIP) $(BINS)
-endif
-
-
-# Whoa. Hack around the fact that we're using CPP for something it
-# wasn't designed to do.
-#
-# Note: I copied and pasted the HTML def to the section below.  Please
-#       make changes in BOTH places.  MLM
-
-ifeq ($(ARCH), WINNT)
-WIN_HTMLDEFS= /D "XP_WIN32" /D"WIN32" $(MCC_SERVER)
-
-$(HTMLDEST)/%.html: %.h
-	cl /nologo /P /EP -I. $(WIN_HTMLDEFS) -Fo$@  $*.h
-	cp $*.i $@
-	rm $*.i
-else
-$(HTMLDEST)/%.html: %.h
-	@echo "$< -> $(HTMLDEST)/$*.html..."
-	@sed -e s/\'/::NETSCAPE_QUOTE_CHAR::/g \
-            -e s/\"/::NETSCAPE_DBL_QUOTE::/g \
-            -e 's^/\*^::NETSCAPE_SLASHSTAR::^g' \
-            -e 's^\*/^::NETSCAPE_STARSLASH::^g' \
-            -e 's^//^::NETSCAPE_DBLSLASH::^g' \
-            -e 's^\.^::NETSCAPE_PERIOD::^g' \
-            -e 's/^# /::NETSCAPE_HASH_BEGIN::/g' $< > /tmp/$*.HTEMP.c
-	@$(CPPCMD) -I. $(MCC_SERVER) -DXP_UNIX $(HTMLDEFS) /tmp/$*.HTEMP.c | \
-            sed -e s/::NETSCAPE_QUOTE_CHAR::/\'/g \
-                -e s/::NETSCAPE_DBL_QUOTE::/\"/g \
-                -e 's^::NETSCAPE_SLASHSTAR::^/\*^g' \
-                -e 's^::NETSCAPE_DBLSLASH::^//^g' \
-                -e 's^::NETSCAPE_PERIOD::^.^g' \
-                -e 's^::NETSCAPE_STARSLASH::^\*/^g' | \
-            egrep -v '^# .*' | grep -v '#ident ' | \
-            sed -e 's/::NETSCAPE_HASH_BEGIN::/# /g' > $(HTMLDEST)/$*.html
-	@rm /tmp/$*.HTEMP.c
-endif
-
-#
-# Compile in TNF_PROBE_*_DEBUG() macros by doing eg: gmake BUILD_DEBUG=optimize TNF_DEBUG=1
-# See aclplugin for TNF_PROBE_0_DEBUG() egs.
-# After do:
-# prex ns-slapd -z -D <instance-dir>
-# enable $all
-# trace $all
-# continue
-# <ctrl-c>
-#
-# and do a tnfdump /tmp/trace-<ns-slapd-PID> to see tnf logs.
-# 
-
-ifeq ($(ARCH), SOLARIS)
-# richm 20050309 - only use mtmalloc on Solaris from now on
-LDAP_DONT_USE_SMARTHEAP=1
-ifdef TNF_DEBUG
-CFLAGS += -DTNF_DEBUG
-endif
-endif
-
-# Do the same for index.lst...
-ifeq ($(ARCH), WINNT)
-L_WIN_HTMLDEFS= /D "XP_WIN32" /D"WIN32" $(MCC_SERVER)
-
-$(HTMLDEST)/%.lst: %.lst
-	cl /nologo /P /EP $(L_WIN_HTMLDEFS) -Fo$@  $*.lst
-	cp $*.i $@
-	rm $*.i
-else
-$(HTMLDEST)/%.lst: %.lst
-	@echo "$< -> $(HTMLDEST)/$*.lst..."
-	@sed -e s/\'/::NETSCAPE_QUOTE_CHAR::/g \
-            -e s/\"/::NETSCAPE_DBL_QUOTE::/g \
-            -e 's^/\*^::NETSCAPE_SLASHSTAR::^g' \
-            -e 's^\*/^::NETSCAPE_STARSLASH::^g' \
-            -e 's^//^::NETSCAPE_DBLSLASH::^g' \
-            -e 's/^# /::NETSCAPE_HASH_BEGIN::/g' $< > /tmp/$*.HTEMP.c
-	@$(CPPCMD) -I. $(MCC_SERVER) -DXP_UNIX $(HTMLDEFS) /tmp/$*.HTEMP.c | \
-            sed -e s/::NETSCAPE_QUOTE_CHAR::/\'/g \
-                -e s/::NETSCAPE_DBL_QUOTE::/\"/g \
-                -e 's^::NETSCAPE_SLASHSTAR::^/\*^g' \
-                -e 's^::NETSCAPE_DBLSLASH::^//^g' \
-                -e 's^::NETSCAPE_STARSLASH::^\*/^g' | egrep -v '^# .*' | \
-            sed -e 's/::NETSCAPE_HASH_BEGIN::/# /g' > $(HTMLDEST)/$*.lst
-	@rm /tmp/$*.HTEMP.c
-endif
-
-# ------------------------- Finally, the modules -------------------------
-$(BUILD_ROOT)/modules.mk: $(BUILD_ROOT)/modules.awk
-	@echo re-making $(BUILD_ROOT)/modules.mk ...
-	@cd $(BUILD_ROOT); sh modules.sh
-
-include $(BUILD_ROOT)/modules.mk
diff --git a/nscore.mk b/nscore.mk
deleted file mode 100644
index f05e35f3..00000000
--- a/nscore.mk
+++ /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) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Shared rules for modules depending on nscore
-
-# AIX uname
-AIXOS_VERSION := $(shell uname -v)
-AIXOS_RELEASE := $(shell uname -r)
-AIXOS = $(AIXOS_VERSION).$(AIXOS_RELEASE)
-
-#
-# Compiler
-#
-# Windows NT
-ifeq ($(ARCH), WINNT)
-  CFLAGS += -DOS_windows -DNT 
-  PROCESSOR := $(shell uname -p)
-  ifeq ($(PROCESSOR), I386)
-    CFLAGS += -DCPU_x86
-  else
-  ifeq ($(PROCESSOR), ALPHA)
-    CFLAGS += -DCPU_alpha
-  else
-  ifeq ($(PROCESSOR), MIPS)
-    CFLAGS += -DCPU_mips
-  endif
-  endif
-  endif
-endif
-# Solaris
-ifeq ($(ARCH), SOLARIS)
-  CFLAGS += -DCPU_sparc -DOS_solaris
-endif
-#Solarisx86
-ifeq ($(ARCH), SOLARISx86)
-  CFLAGS += -DOS_solaris
-endif
-
-# HP-UX
-ifeq ($(ARCH), HPUX)
-  HPUX_ARCH := $(shell uname -m)
-  ifeq ($(HPUX_ARCH), ia64)
-    CFLAGS += -DCPU_ia64 -DOS_hpux
-  else
-    CFLAGS += -DCPU_hppa -DOS_hpux
-  endif
-  CFLAGS += -D_NO_THREADS_
-endif
-# AIX
-ifeq ($(ARCH), AIX)
-  CFLAGS += -DCPU_powerpc -DOS_aix
-endif
-# IRIX
-ifeq ($(ARCH), IRIX)
-  CFLAGS += -DCPU_mips -DOS_irix
-  CFLAGS += -D_NO_THREADS_
-endif
-# OSF1
-ifeq ($(ARCH), OSF1)
-  CFLAGS += -DCPU_alpha -DOS_osf1
-endif
-ifeq ($(ARCH), UNIXWARE)
-  CFLAGS += -DSYSV -DSVR4 -DCPU_i486 -DOS_unixware
-endif
-ifeq ($(ARCH), UnixWare)
-  CFLAGS += -DSYSV -DCPU_i486 -DOS_unixware
-  SYSV_REL := $(shell uname -r)
-ifeq ($(SYSV_REL), 5)
-  CFLAGS += -DSVR5
-else
-  CFLAGS += -DSVR4
-endif
-endif
-ifeq ($(ARCH), SCO)
-  CFLAGS += -DSYSV -DCPU_i486 -DOS_sco
-endif
-ifeq ($(ARCH), NCR)
-  CFLAGS += -DSYSV -DSVR4 -DCPU_i486 -DOS_ncr
-endif
diff --git a/nsdefs.mk b/nsdefs.mk
deleted file mode 100644
index 1fc8140e..00000000
--- a/nsdefs.mk
+++ /dev/null
@@ -1,244 +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
-#
-#
-# These are the default values 
-#
-# Individual modules may override them
-#
-# BUILD_BOMB=[-DPUMPKIN_HOUR=xxxxxxx or just leave it empty]
-# BUILD_DEBUG=[full, optimize, purify, quantify]
-# BUILD_MODULE=[HTTP_ADMIN, ...]
-# BUILD_SECURITY=[none, export, domestic]
-
-TMP_ARCH := $(shell uname -s)
-RELEASE := $(shell uname -r)
-ifeq ($(TMP_ARCH), WINNT)
-BUILD_ARCH := $(shell uname -s)
-else
-BUILD_ARCH := $(shell $(BUILD_ROOT)/nsarch)
-endif
-
-NSOS_TEST1 := $(shell uname -m)
-
-USE_HCL=1
-
-BUILD_CHECKER=no
-ifndef BUILD_DEBUG
-BUILD_DEBUG=full
-endif
-BUILD_MODULE=DIRECTORY
-BUILD_NSPR_THREADS=yes
-ifndef BUILD_SECURITY
-BUILD_SECURITY=domestic
-endif
-ifeq ($(USE_PTHREADS), 1)
-  ifeq ($(USE_N32), 1)
-    BUILD_PTHREADS=-n32-pth
-  else
-    BUILD_PTHREADS=-pth
-  endif
-else
-  BUILD_PTHREADS=
-endif
-
-ifdef USE_64
-  NS64TAG=_64
-else
-  ifeq ($(BUILD_ARCH), HPUX)
-    ifeq ($(NSOS_TEST1),ia64)
-      NS64TAG=_32
-    endif
-  endif
-endif
-
-ifeq ($(BUILD_ARCH), HPUX)
-  ifeq ($(NSOS_TEST1),ia64)
-    NSOS_TEST1_TAG=_$(NSOS_TEST1)
-  endif
-endif
-
-# Check if we're on RHEL
-ifeq ($(BUILD_ARCH), Linux)
-  ARCH_TEST := $(shell cat /etc/redhat-release)
-  ifeq ($(findstring Taroon, $(ARCH_TEST)),Taroon)
-    BUILD_ARCH = RHEL3
-  else
-  ifeq ($(findstring Nahant,  $(ARCH_TEST)),Nahant)
-    BUILD_ARCH = RHEL4
-  endif
-  endif
-endif
-
-# Should we build Java code on this platform?
-ifndef BUILD_JAVA_CODE
-ifeq ($(BUILD_ARCH),SOLARIS)
-BUILD_JAVA_CODE=0
-else
-ifeq ($(BUILD_ARCH),WINNT)
-BUILD_JAVA_CODE=0
-else
-BUILD_JAVA_CODE=0
-endif # WINNT
-endif # SOLARIS
-endif # !BUILD_JAVA_CODE
-
-NSPR_SUF=20
-LDAP_SUF=60
-
-IS_DIR_LITE=false
-
-# Foreign language support
-WEBSERVER_LANGS = ja fr de
-
-# default path where to look for shared libraries at runtime
-ifeq ($(BUILD_ARCH), WINNT)
-RPATHFLAG=..\bin\slapd\lib:..\lib:..\..\lib:..\..\..\lib:..\..\..\..\lib
-else
-ifeq ($(BUILD_ARCH), SOLARIS)
-RPATHFLAG=\$$ORIGIN/../bin/slapd/lib:\$$ORIGIN:\$$ORIGIN/../lib:\$$ORIGIN/../../lib:\$$ORIGIN/../../../lib:\$$ORIGIN/../../../../lib
-else
-RPATHFLAG=../bin/slapd/lib:.:../lib:../../lib:../../../lib:../../../../lib
-endif
-endif
-
-MAJOR_VERSION:="1"
-MINOR_VERSION:="0"
-MAJOR_VERSION_NOQUOTES:=1
-MINOR_VERSION_NOQUOTES:=0
-
-# the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME)
-ifeq ($(BUILD_ARCH), WINNT)
-LINK_HTTPDLL_NAME=ns-dshttpd$(MAJOR_VERSION_NOQUOTES)$(MINOR_VERSION_NOQUOTES)
-BUILD_HTTPDLL_NAME=$(LINK_HTTPDLL_NAME)
-else
-LINK_HTTPDLL_NAME=ns-dshttpd$(MAJOR_VERSION)$(MINOR_VERSION)
-BUILD_HTTPDLL_NAME=lib$(LINK_HTTPDLL_NAME)
-endif # WINNT
-
-ifeq ($(BUILD_ARCH), WINNT)
-GUNZIP=gzip -d
-BUILD_DLL_VERSION=yes
-BUILD_ADMIN_NAME=ns-admin30
-BUILD_IIOPLIB=yes
-else
-GUNZIP=gunzip -d
-endif
-
-define echo_build_parms
-echo ==== Building with the following parameters ====
-echo BUILD_ARCH=$(BUILD_ARCH) 
-echo BUILD_MODULE=$(BUILD_MODULE)
-echo BUILD_SECURITY=$(BUILD_SECURITY)
-echo BUILD_DEBUG=$(BUILD_DEBUG)
-echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS)
-echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION)
-echo BUILD_HTTPDLL_NAME=$(BUILD_HTTPDLL_NAME)
-echo BUILD_ADMIN_NAME=$(BUILD_ADMIN_NAME)
-echo BUILD_CHECKER=$(BUILD_CHECKER)
-echo BUILD_IIOPLIB=$(BUILD_IIOPLIB)
-endef
-
-#
-# Set up these names because most of the makefiles use them now.
-#
-ifeq ($(findstring RHEL, $(BUILD_ARCH)), RHEL)
-  ARCH = Linux
-else
-  ARCH=$(BUILD_ARCH)
-endif
-SECURITY=$(BUILD_SECURITY)
-DEBUG=$(BUILD_DEBUG)
-NSPR_THREADS=$(BUILD_NSPR_THREADS)
-BUILD_DLL=$(BUILD_DLL_VERSION)
-ADMINDLL_NAME=$(BUILD_ADMIN_NAME)
-HTTPDLL_NAME=$(BUILD_HTTPDLL_NAME)
-BOUNDS_CHECKER=$(BUILD_CHECKER)
-RESOLV_FLAG=
-DO_SEARCH=
-NODE_FLAG=-DNO_NODELOCK
-
-# It would be best if all output dir definitions below used this, rather than
-# repeating it
-ifeq ($(ARCH), WINNT)
-ifdef DEBUG_RUNTIME
-ifeq ($(DEBUG), full)
-RTSUFFIX=-d
-endif
-endif
-endif
-BASIC_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
-
-NSPR_DIR=nspr
-NSPR_BASENAME=libnspr21
-PRODUCTCORE=Fedora Directory Server
-PRODUCT="$(PRODUCTCORE)"
-PRODUCT_IS_DIRECTORY_SERVER=1
-INSTANCE_NAME_PREFIX="Directory Server"
-DIR=slapd
-NS_PRODUCT=DIRECTORY_SERVER
-ifdef INCLUDE_SSL
-SSL_PREFIX=-ssl
-endif
-NS_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
-NC_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
-COMMON_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
-COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR))
-OBJDIR=$(COMMON_OBJDIR)
-OBJDIR_32=$(COMMON_OBJDIR_32)
-DO_SEARCH=no
-DIR_VERSION:=1.0.4
-NOSP_DIR_VERSION:=1.0.4
-DIR_NORM_VERSION:=1.0
-PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
-# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
-# update all of the .exp and .def files by executing the following command:
-#	cd ldap/libraries; gmake exportfiles
-# Don't forget to commit the new files.  Eventually this step will be
-# integrated into the build process.  -- Mark Smith <mcs@netscape.com>
-DIRSDK_VERSION:=3.1
-DIRSDK_VERSION_DLL_SUFFIX:=$(LDAP_SUF)
-LDAP_NO_LIBLCACHE:=1
-
-DIRVERDIR=$(COMMON_OBJDIR)/include
-DIRVER_H=$(DIRVERDIR)/dirver.h
-SDKVER_H=$(DIRVERDIR)/sdkver.h
-
-# this is the one that adminutil, setuputil, and adminserver uses
-COMPONENT_OBJDIR=$(FULL_RTL_OBJDIR)
diff --git a/nsperl.mk b/nsperl.mk
deleted file mode 100755
index f92d697a..00000000
--- a/nsperl.mk
+++ /dev/null
@@ -1,55 +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
-#
-
-NSPERL_RELDATE := 20020626
-# default; will be redefined below for specific platform
-#PERL=$(NSPERL_COMPONENT_DIR)/lib/$(NSPERL_VERSION)/nsperl
-PERL=perl
-ifeq ($(BUILD_ARCH), WINNT)
-PERL=nsperl
-endif
-
-ifdef USE_OLD_NTPERL
-PERL=perl
-endif
-
-ifdef USE_PERL_FROM_PATH
-PERL = $(shell perl -e 'print "$$\n"')
-endif