From faddb92caec964b4b201732c04814c902d641909 Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@redhat.com>
Date: Oct 30 2006 22:45:56 +0000
Subject: Related: 213070

Summary: Removed old build-system Makefiles.

---

diff --git a/Makefile b/Makefile
deleted file mode 100755
index f567645..0000000
--- a/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-#
-#   Makefile to build/package Admin Util
-#
-
-# 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 nsconfig.mk
-
-all: buildAndPkgAdminUtil
-
-help:
-	@echo
-	@echo The following are build targets that you can choose from:
-	@echo
-	@echo "   gmake buildAdminUtil"
-	@echo "   gmake pkgAdminUtil"
-	@echo "   gmake with no arguments will do buildAndPkgAdminUtil, which "
-	@echo "         is usually what you want to do"
-	@echo
-
-ifeq ($(INTERNAL_BUILD), 1)
-COMPONENT_DEPENDENCIES = $(NSPR_DEP) $(SECURITY_DEP) $(ICU_DEP) $(LDAPSDK_DEP) 
-
-$(RELTOOLS): 
-	cd $(ABS_ROOT_PARENT) ; cvs co RelToolsLite
-
-versionAdminUtil: $(RELTOOLS)
-	@echo ==== Versioning AdminUtil ==========
-	$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat
-	@echo ==== Finished Versioning AdminUtil ==========
-
-normalizeAdminUtil: $(RELTOOLS)
-	@echo ==== Normalizing Admin Util ==========
-	$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat
-	@echo ==== Finished Normalizing Admin Util ==========
-endif
-
-components: $(COMPONENT_DEPENDENCIES)
-	-@echo "The components are up to date"
-
-pumpkin:
-	$(PERL5) pumpkin.pl $(PUMPKIN_AGE) pumpkin.dat
-
-buildnum:
-	if test ! -d $(NSPLATFORM_ID); then mkdir $(NSPLATFORM_ID); fi;
-	$(PERL5) buildnum.pl -p $(NSPLATFORM_ID)
-	@mybuildnum=`cat $(NSPLATFORM_ID)/buildnum.dat`; \
-	sed -e "s/\(ADMSDK_BUILDNUM\).*/\1 $$mybuildnum/" include/version.h > include/version.h.tmp; \
-	mv include/version.h.tmp include/version.h
-
-$(DIRVER_H):
-	if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi;
-	$(PERL5) dirver.pl -v "$(ADMSDK_VERSION)" -o $@
-
-buildAndPkgAdminUtil:   buildAdminUtil pkgAdminUtil
-
-buildAdminUtil:   buildnum pumpkin $(DIRVER_H) components
-	@echo
-	@echo ==== Building AdminUtil  ==========
-	@echo
-	cd lib/libadminutil; 	$(MAKE)
-	cd lib/libadmsslutil; 	$(MAKE)
-	@echo ============== Finished ============================
-
-pkgAdminUtil:
-	@echo
-	@echo ==== Start Admin Util Package ==========
-	@echo
-	$(MAKE) -f pkgadminutil.mk
-	@echo ==== Finished  Admin Util Package ==========
-	@echo
-
-$(ADMINUTILSPEC):
-	sed -e 's/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g' \
-		-e 's/@GEN-VERSION@/1.0/g' \
-		-e 's/@GEN-VERSION-NODOT@/10/g' \
-		-e 's/@PRODUCT-NAME@/Admin Util/g' \
-		-e 's/@PRODUCT-SHORT-NAME@/adminutil/g' \
-		-e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
-		adminutil.spec.tmpl > $@
diff --git a/buildpaths.mk b/buildpaths.mk
deleted file mode 100644
index eb69b6e..0000000
--- a/buildpaths.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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
-
-ifdef MOZILLA_SOURCE_ROOT_EXT
-  MOZILLA_SOURCE_ROOT=$(BUILD_ROOT)/$(MOZILLA_SOURCE_ROOT_EXT)
-else
-  MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
-endif
-
-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)))
-    else
-      ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
-        MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
-      else
-        ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
-          MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
-        else
-          MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
-        endif
-      endif
-    endif
-  endif
-endif
-
-NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-# NSPR also needs a build dir with a full, absolute path for some reason
-#NSPR_ABS_BUILD_DIR = $(shell cd $(NSPR_BUILD_DIR) && pwd)
-
-SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#SECURITY_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
-
-LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.15
-
-ifdef ICU_SOURCE_ROOT_EXT
-  ICU_SOURCE_ROOT = $(BUILD_ROOT)/$(ICU_SOURCE_ROOT_EXT)
-else
-  ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-endif
-ICU_BUILD_DIR = $(ICU_SOURCE_ROOT)/built
diff --git a/component_versions.mk b/component_versions.mk
deleted file mode 100644
index 16dce14..0000000
--- a/component_versions.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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
-endif
-
-# SECURITY (NSS) LIBRARY
-ifndef SECURITY_RELDATE
-  SECURITY_RELDATE = NSS_3_11_3_RTM
-endif
-
-# LDAP SDK
-ifndef LDAP_RELDATE
-  LDAP_RELDATE = v6.0.0
-endif
-ifndef LDAPCOMP_DIR
-  LDAPCOMP_DIR=ldapcsdk
-endif
-ifndef LDAP_SUF
-  LDAP_SUF=60
-endif
-
-# infozip utilities
-ifndef INFOZIP_RELDATE
-  INFOZIP_RELDATE = CMSTOOLS_7_x
-endif
-
-# ICU
-ifndef ICU_VERSDIR
-  ICU_VERSDIR=libicu_3_4
-endif
-ifndef ICU_RELDATE
-  ICU_RELDATE=
-endif
-
diff --git a/components.mk b/components.mk
deleted file mode 100644
index 08d31f1..0000000
--- a/components.mk
+++ /dev/null
@@ -1,255 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-#
-# This makefile is used to grab all the components needed to build.
-#
-#
-#
-
-COMMA :=,
-NULLSTRING :=
-SPACE :=$(NULLSTRING) # the space is between the ) and the #
-
-ifeq ($(ARCH), WINNT)
-EXE_SUFFIX = .exe
-else # unix - windows has no lib name prefix, except for nspr
-LIB_PREFIX = lib
-endif
-
-include $(ABS_ROOT)/nsperl.mk
-
-ifeq ($(INTERNAL_BUILD), 1)
-include $(ABS_ROOT)/internal_buildpaths.mk
-else
-include $(ABS_ROOT)/buildpaths.mk
-endif
-
-all:
- 
-#Temporary integration area components
-INT_ICU = 0
-INT_NSPR = 0
-INT_NSS = 0
-INT_LDAPSDK = 0
-INT_SVRCORE = 0 
-
-# 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_INCLUDE_DIR
- NSPR_INCDIR = $(NSPR_INCLUDE_DIR)
-else
- ifdef NSPR_SOURCE_ROOT
-  NSPR_INCDIR = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/include
- else
-  NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
- endif
-endif
-ifdef NSPR_LIB_DIR
- NSPR_LIBPATH = $(NSPR_LIB_DIR)
-else
- ifdef NSPR_SOURCE_ROOT
-  NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- else
-  NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib
- endif
-endif
-NSPR_INCLUDE = -I$(NSPR_INCDIR)
-NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES)))
-
-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 NSS_INCLUDE_DIR
- SECURITY_INCDIR = $(NSS_INCLUDE_DIR)
-else
- ifdef SECURITY_SOURCE_ROOT
-  SECURITY_INCDIR = $(SECURITY_SOURCE_ROOT)/dist/public/nss
- else
-  SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
- endif
-endif
-
-ifdef NSS_LIB_DIR
- SECURITY_LIBPATH = $(NSS_LIB_DIR)
-else
- ifdef SECURITY_SOURCE_ROOT
-  SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- else
-  SECURITY_LIBPATH = $(SECURITY_BUILD_DIR)/lib
- endif
-endif
-
-SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
-# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
-
-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
-
-### SECURITY END #############################
-
-####################################################
-# LDAP SDK
-###################################################
-
-ifdef LDAPCSDK_INCLUDE_DIR
- LDAPSDK_INCDIR = $(LDAPCSDK_INCLUDE_DIR)
-else
- ifdef LDAPSDK_SOURCE_ROOT
-  LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
- else
-  LDAPSDK_INCDIR = $(LDAP_ROOT)/include
- endif
-endif
-
-ifdef LDAPCSDK_LIB_DIR
- LDAPSDK_LIBPATH = $(LDAPCSDK_LIB_DIR)
-else
- ifdef LDAPSDK_SOURCE_ROOT
-  LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
- else
-  LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
- endif
-endif
-
-LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
-
-# package the include files - needed for the plugin API
-LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h)
-
-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)))
-
-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)
-
-endif
-
-LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
-LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-
-### ICU package ##########################################
-
-ICU_LIB_VERSION = 34
-ifdef ICU_BIN_DIR
- ICU_BINPATH = $(ICU_BIN_DIR)
-else
- ifdef ICU_SOURCE_ROOT
-  ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
- else
-  ICU_BINPATH = $(ICU_BUILD_DIR)/bin
- endif
-endif
-
-ifdef ICU_INCLUDE_DIR
- ICU_INCPATH = $(ICU_INCLUDE_DIR)
-else
- ifdef ICU_SOURCE_ROOT
-  ICU_INCPATH = $(ICU_SOURCE_ROOT)/built/include
- else
-  ICU_INCPATH = $(ICU_BUILD_DIR)/include
- endif
-endif
-
-ifdef ICU_LIB_DIR
- ICU_LIBPATH = $(ICU_LIB_DIR)
-else
- ifdef ICU_SOURCE_ROOT
-  ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
- else
-  ICU_LIBPATH = $(ICU_BUILD_DIR)/lib
- endif
-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))
-else
-  ICU_LIBNAMES = icui18n icuuc icudata
-  ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES))
-endif
-
-# Resource Bundle Compiler
-ifeq ($(ARCH), WINNT)
-    ICU_GENRB = $(ICU_BINPATH)/genrb.exe
-else
-  ifdef ICU_BIN_DIR
-    ICU_GENRB = genrb
-  else
-    ICU_GENRB = sh ./genrb_wrapper.sh  $(ICU_BUILD_DIR)
-  endif
-endif
-
-###########################################################
-
-ifeq ($(INTERNAL_BUILD), 1)
-include $(ABS_ROOT)/internal_comp_deps.mk
-endif
diff --git a/include/Makefile b/include/Makefile
deleted file mode 100644
index fc84d9b..0000000
--- a/include/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-# Makefile for netsite.h
-
-MCOM_ROOT = ../..
-MODULE=netsiteInclude
-
-include ../nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include
-
-NSPRDEST=$(HDRDEST)
-NSPRHDRS= \
-	prio.h \
-	prlong.h \
-	prtypes.h \
-	prtime.h \
-	prthread.h \
-	prinrval.h \
-	md/prcpucfg.h \
-	obsolete/protypes.h
-
-NSPRBINS=$(addprefix $(NSPRDEST)/, $(NSPRHDRS))
-
-PREFIX=copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-HDRS=netsite.h version.h
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: stuff nspr
-
-strip:
-depend:
-
-include ../nsconfig.mk
-
-ifeq ($(NSAPI_CAPABLE), true)
-
-stuff: $(HDRDEST) $(BINS) sub-hdrs
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-sub-hdrs:
-	cd base; gmake
-	cd frame; gmake
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
-
-else
-stuff:
-
-endif
-
-$(NSPRDEST): 
-	mkdir -p $(NSPRDEST)
-
-$(NSPRDEST)/md: $(NSPRDEST)
-	mkdir -p $(NSPRDEST)/md
-
-$(NSPRDEST)/obsolete: $(NSPRDEST)
-	mkdir -p $(NSPRDEST)/obsolete
-
-$(NSPRDEST)/%.h: 
-	cp $(NSCP_DISTDIR)/include/nspr20/pr/$*.h $(NSPRDEST)/$*.h
-
-nspr: $(NSPRDEST)/md $(NSPRDEST)/obsolete $(NSPRBINS)
diff --git a/internal_buildpaths.mk b/internal_buildpaths.mk
deleted file mode 100644
index dfef694..0000000
--- a/internal_buildpaths.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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
-
-ifndef COMPONENTS_DIR
-COMPONENTS_DIR = /share/builds/components
-endif
-ifndef INT_DIR
-INT_DIR = /share/builds/sbsintegration
-endif
-ifndef RELTOOLS
-RELTOOLS = $(ABS_ROOT_PARENT)/reltools
-endif
-
-# 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
-
-# work around vsftpd -L problem
-ifeq ($(COMPONENT_PULL_METHOD), FTP)
-ifdef USING_VSFTPD
-	VSFTPD_HACK=1
-endif
-endif
-
-#NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef NSPR_SOURCE_ROOT
-NSPR_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nspr
-# 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
-
-#SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef SECURITY_SOURCE_ROOT
-SECURITY_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nss
-endif # SECURITY_SOURCE_ROOT
-
-#LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef LDAPSDK_SOURCE_ROOT
-LDAP_ROOT = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk
-endif # LDAPSDK_SOURCE_ROOT
-
-#ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-ifndef ICU_SOURCE_ROOT
-ICU_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/libicu
-endif # ICU_SOURCE_ROOT
-
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
deleted file mode 100644
index 818bc3c..0000000
--- a/internal_comp_deps.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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.
-
-FTP_PULL = $(PERL) $(RELTOOLSPATH)/ftp_puller_new.pl -logdir $(ABS_ROOT_PARENT) 
-
-BUILD_MODE = ext
-
-ifndef NSPR_SOURCE_ROOT
-NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(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): $(RELTOOLS) $(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
-else
-SECURITY_FILES=lib,include
-endif
-
-ifndef SECURITY_PULL_METHOD
-SECURITY_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SECURITY_DEP): $(RELTOOLS) $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(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 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_NAME)
-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
-
-ifndef LDAPSDK_PULL_METHOD
-LDAPSDK_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(LDAPSDK_DEP): $(RELTOOLS) $(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
-endif # LDAPSDK_SOURCE_ROOT
-
-ifndef ICU_SOURCE_ROOT
-#ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
-ICU_RELEASE = $(INT_DIR)/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): $(RELTOOLS) $(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
-
-######## END OF OPEN SOURCE COMPONENTS ######################
-
diff --git a/lib/libadminutil/Makefile b/lib/libadminutil/Makefile
deleted file mode 100644
index 2c227cc..0000000
--- a/lib/libadminutil/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-# The adminutil libraries
-
-BUILD_ROOT=../..
-
-MODULE=LibAdminUtil
-MODULE_CFLAGS=
-
-include ../../nsconfig.mk
-
-OBJLIBDIR=$(OBJDIR)/lib
-OBJDEST=$(OBJLIBDIR)/libadminutil
-
-ifeq ($(ARCH), WINNT)
-  ifeq ($(DEBUG), fulld)
-    LIBS=$(OBJLIBDIR)/libadminutild_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=libadminutild
-  else
-    LIBS=$(OBJLIBDIR)/libadminutil_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=libadminutil
-  endif
-else
-  LIBS=$(OBJLIBDIR)/libadminutil-$(ADMSDK_SO_DOTVERSION).a
-  SO_NAME=libadminutil
-endif
-
-include ../../nsconfig.mk
-
-SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX)
-SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION)
-SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT)
-
-ifeq ($(ARCH), AIX)
-override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \
-	-bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \
-	/usr/lib/libc.a -ldl -lbsd -brtl -berok
-
-LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES))
-endif
-
-OBJS=$(addprefix $(OBJDEST)/, psetc.o admutil.o distadm.o srvutil.o \
-                              errRpt.o form_post.o strlist.o \
-			      resource.o uginfo.o $(OSOBJS))
-
-all: $(OBJDEST) $(SO_LIB) resource_bundle
-
-$(OBJDEST):
-	mkdir -p $(OBJDEST)
-
-# stop building static libraries
-#ifeq ($(ARCH), WINNT)
-#$(LIBS): $(OBJS)
-#	rm -f $@
-#	$(AR) $(OBJS)
-#	$(RANLIB) $@
-#else
-#$(LIBS): $(OBJS)
-#	rm -f $@
-#	$(AR) $(OBJS)
-#	$(RANLIB) $@
-#endif
-
-ifeq ($(ARCH), AIX)
-ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp
-$(SO_LIB): $(OBJS)
-	nm -B -C -g $(OBJS) \
-			| awk '/ [T,D,B] / {print $$3}' \
-			| sed -e 's/^\.//' \
-			| sort -u > $(ADM_EXPORT_FILE)
-	$(LD) $(DLL_LDFLAGS) -o $(SO_LIB) -bE:$(ADM_EXPORT_FILE) \
-                        $(OBJS) \
-			$(DEPLIBS) $(EXTRA_LIBS)
-else
-ifeq ($(ARCH), WINNT)
-$(SO_LIB): $(OBJDEST)/dllVersionInfo.res $(OBJS)
-	rm -f $@
-	$(PURIFY) $(LINK_DLL) $(DEPLIBS) $(OBJDEST)/dllVersionInfo.res $(OBJS) $(EXTRA_LIBS)
-	echo $(SO_LIB) finished
-else
-$(SO_LIB): $(OBJS)
-	rm -f $@
-	$(LINK_DLL) $(OBJS) $(DEPLIBS)
-	cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT)
-	cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION)
-endif
-endif
-
-resource_bundle: $(OBJDEST) libadminutil.properties
-	$(ICU_GENRB) -s. -d$(OBJDEST) --encoding ISO_8859-1 --package-name libadminutil libadminutil.properties
-
diff --git a/lib/libadminutil/genrb_wrapper.sh b/lib/libadminutil/genrb_wrapper.sh
deleted file mode 100644
index 1240521..0000000
--- a/lib/libadminutil/genrb_wrapper.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-
-# A wrapper for ICU utility genrb on Unix.
-# Sets LD_LIBRARY_PATH before invoking the command
-
-if [ $# -lt 2 ]; then
-   echo Usage: $0 path_to_icu_root_dir [ genrb parameters ]
-   exit 1
-fi
-
-ICU_DIR=$1
-shift
-
-LD_LIBRARY_PATH=$ICU_DIR/lib:$LD_LIBRARY_PATH
-
-# HP SHLIB_PATH
-SHLIB_PATH=$ICU_DIR/lib:$SHLIB_PATH
-
-export LD_LIBRARY_PATH SHLIB_PATH
-echo $ICU_DIR/bin/genrb $@
-exec $ICU_DIR/bin/genrb $@
diff --git a/lib/libadmsslutil/Makefile b/lib/libadmsslutil/Makefile
deleted file mode 100644
index c2a9b49..0000000
--- a/lib/libadmsslutil/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-# The adminutil libraries
-
-BUILD_ROOT=../..
-
-MODULE=LibAdmSSLUtil
-MODULE_CFLAGS=
-
-include ../../nsdefs.mk
-
-OBJLIBDIR=$(OBJDIR)/lib
-OBJDEST=$(OBJLIBDIR)/libadmsslutil
-
-ifeq ($(ARCH), WINNT)
-  ifeq ($(DEBUG), fulld)
-    LIBS=$(OBJLIBDIR)/libadmsslutild_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=libadmsslutild
-  else
-    LIBS=$(OBJLIBDIR)/libadmsslutil_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=libadmsslutil
-  endif
-else
-  LIBS=$(OBJLIBDIR)/libadmsslutil-$(ADMSDK_SO_DOTVERSION).a
-  SO_NAME=libadmsslutil
-endif
-
-include ../../nsconfig.mk
-
-SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX)
-SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION)
-SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT)
-
-ifeq ($(ARCH), AIX)
-override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \
-	-bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \
-	/usr/lib/libc.a -ldl -lbsd -brtl -berok
-
-ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp
-endif
-
-#
-# Don't build sslpset.c since the open-source SVRCORE doesn't have everything it needs
-#
-#OBJS=$(addprefix $(OBJDEST)/, certmgt.o secpwd.o sslerror.o admsslutil.o psetcssl.o \
-#			      srvutilssl.o uginfossl.o sslpset.o $(OSOBJS))
-
-OBJS=$(addprefix $(OBJDEST)/, certmgt.o secpwd.o sslerror.o admsslutil.o psetcssl.o \
-			      srvutilssl.o uginfossl.o $(OSOBJS))
-
-all: $(OBJDEST) $(SO_LIB)
-
-
-$(OBJDEST):
-	echo $(SO_LIB)
-	mkdir -p $(OBJDEST)
-
-# stop building static libraries
-#$(LIBS): $(OBJS)
-#	rm -f $@
-#	$(AR) $(OBJS)
-#	$(RANLIB) $@
-
-ifeq ($(ARCH), AIX)
-$(SO_LIB): $(OBJS)
-	nm -B -C -g $(OBJS) \
-			| awk '/ [T,D,B] / {print $$3}' \
-			| sed -e 's/^\.//' \
-			| sort -u > $(ADM_EXPORT_FILE)
-	$(LD) $(DLL_LDFLAGS) -o $(SO_LIB) -bE:$(ADM_EXPORT_FILE) \
-                        $(OBJS) \
-			$(DEPLIBS) $(EXTRA_LIBS)
-else
-ifeq ($(ARCH), WINNT)
-$(SO_LIB): $(OBJDEST)/dllVersionInfo.res $(OBJS)
-	rm -f $@
-	$(PURIFY) $(LINK_DLL) $(DEPLIBS) $(OBJDEST)/dllVersionInfo.res $(OBJS) $(EXTRA_LIBS)
-	echo $(SO_LIB) finished
-else
-$(SO_LIB): $(OBJS)
-	rm -f $@
-	$(LINK_DLL) $(OBJS) $(DEPLIBS)
-	cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT)
-	cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION)
-endif
-endif
-
-#include $(INCLUDE_DEPENDS)
diff --git a/nsarch b/nsarch
deleted file mode 100755
index 1f1f17c..0000000
--- a/nsarch
+++ /dev/null
@@ -1,815 +0,0 @@
-#! /bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-# Name:         nsarch
-#
-# Description:  this file determines the system name and outputs the
-#               platform information in a format used by build
-#               scripts and utilities; this file is based on the GNU
-#               "config.guess" utility; the GNU copyleft is provided
-#               somewhere below...
-#
-#    For each platform supported, we need to provide the
-#    following definitions:
-#
-# Variable           Description
-# --------           -----------
-# NS_NAME:        one word, all upper case system name usually from uname -s that
-#                 can be used for Makefiles and #defines
-#
-# NS_RELEASE:     release number of the OS; if there's a trademark name (like UnixWare),
-#                 then this is typically the release number of the marketing name
-#                 (like UnixWare 2.1) rather than the version of generic Unix it is
-#                 based on (like System V r4.2)
-#                 this number comes generally from uname -r, but on some systems
-#                 we need to use uname -v
-#
-# NS_PRETTY_NAME: one word, mixed case system name similar to NS_NAME, but useful
-#                 for scripts that output something for users to see
-#--------------------------------------------------------------------------
-# GNU's copyleft for "configure.guess"
-#
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
-#
-# This file 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-#--------------------------------------------------------------------------
-# shell functions
-output_format='standard'
-divider=''
-pretty=0
-
-usage(){
-   echo "Usage: $0 [ [-full {-under | -dash | -none} {-pretty} ] | -gnu ]"
-   echo
-   echo "    <no args>               Default to output OS name only; suitable for use"
-   echo "                            in makefiles and compiler defines"
-   echo "    -f, -full, --full)      Full output includes OS name and release number"
-   echo "    -d, -dash, --dash)      use with -f to specify a dash separator"
-   echo "    -u, -under, --under)    use with -f to specify a underscore separator"
-   echo "    -n, -none, --none)      use with -f to specify no separator"
-   echo "    -p, -pretty, --pretty)  Print prettier mixed case version of OS name"
-   echo "    -g, -gnu, --gnu)        GNU-style: <chip_arch>-<vendor>-<os_release>"
-   echo "    -h, -help, --help)      Print this usage message"
-   echo; echo
-}
-
-get_opt(){
-   ARGS=$*
-   cntr=0
-   while [ $cntr -lt $# ]
-   do
-     case $1 in
-       -h|-help|--help)      usage
-                             exit 0;;
-       -f|-full|--full)      output_format="full";;
-       -d|-dash|--dash)      divider="dash";;
-       -u|-under|--under)    divider="underscore";;
-       -n|-none|--none)      divider="none";;
-       -p|-pretty|--pretty)  pretty=1;;
-       -g|-gnu|--gnu)        output_format="gnu";;
-       *)                    echo "Error: unknown argument: $1"; echo
-                             usage
-                             exit 1;;
-     esac
-     shift
-   done
-}
-
-ns_printf(){
-   # handle the case where we didn't set NS_NAME
-   if [ -z "${NS_NAME}" ]; then
-     NS_NAME="${UNAME_SYSTEM}"
-   fi
-
-   # handle the case where we don't have a pretty name
-   if [ -z "${NS_PRETTY_NAME}" ]; then
-     NS_PRETTY_NAME="${NS_NAME}"
-   fi
-
-   # determine which output format to use
-   case ${output_format} in
-     'standard')
-                    if [ $pretty -eq 1 ]; then
-                      echo ${NS_PRETTY_NAME}
-                    else
-                      echo ${NS_NAME}
-                    fi;;
-     'full')
-                    if [ $pretty -eq 1 ]; then
-                      case "$divider" in
-                        'dash')       echo ${NS_PRETTY_NAME} ${NS_RELEASE} | sed -e 's/ /-/';;
-                        'underscore') echo ${NS_PRETTY_NAME} ${NS_RELEASE} | sed -e 's/ /_/';;
-                        'none')       echo ${NS_PRETTY_NAME} ${NS_RELEASE} | sed -e 's/ //';;
-                        *)            echo ${NS_PRETTY_NAME} ${NS_RELEASE};;
-                      esac
-                    else
-                      # since we're outputing full, we don't need the redundant "4"
-                      # in the ${NS_NAME}
-                      if [ ${NS_NAME} = "SUNOS4" ]; then
-                        NS_NAME="SUNOS"
-                      fi
-                      case "$divider" in
-                        'dash')       echo ${NS_NAME} ${NS_RELEASE} | sed -e 's/ /-/';;
-                        'underscore') echo ${NS_NAME} ${NS_RELEASE} | sed -e 's/ /_/';;
-                        'none')       echo ${NS_NAME} ${NS_RELEASE} | sed -e 's/ //';;
-                        *)            echo ${NS_NAME} ${NS_RELEASE};;
-                      esac
-                    fi;;
-     'gnu')             echo ${GNU_NAME};;
-   esac
-}
-
-
-#--------------------------------------------------------------------------
-# main - get the arguments and start running
-get_opt $*
-
-#--------------------------------------------------------------------------
-# everything that follows is GNU's config.guess slightly modified
-# for our use
-
-# NT doesn't have /dev/null
-#UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown
-#UNAME_RELEASE=`(uname -r) 2> /dev/null` || UNAME_RELEASE=unknown
-#UNAME_SYSTEM=`(uname -s) 2> /dev/null` || UNAME_SYSTEM=unknown
-#UNAME_VERSION=`(uname -v) 2> /dev/null` || UNAME_VERSION=unknown
-
-UNAME_MACHINE=`(uname -m)` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r)` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s)` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v)` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	#echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
-	GNU_NAME="alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`"
-        NS_NAME="${UNAME_SYSTEM}"
-        NS_RELEASE="`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`"
-        ns_printf
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	#echo alpha-dec-winnt3.5
-        GNU_NAME="alpha-dec-winnt3.5"
-        NS_NAME="WINNT"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
-	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    Pyramid*:OSx*:*:*)
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		#echo pyramid-pyramid-sysv3
-		GNU_NAME="pyramid-pyramid-sysv3"
-	else
-		#echo pyramid-pyramid-bsd
-		GNU_NAME="pyramid-pyramid-bsd"
-	fi
-        ns_printf
-	exit 0 ;;
-    sun4*:SunOS:5.*:*)
-	#echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	GNU_NAME="sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`"
-        NS_NAME="SOLARIS"
-        NS_PRETTY_NAME="Solaris"
-        NS_RELEASE="`echo ${UNAME_RELEASE}|sed -e 's/[^.]*/2/'`"
-        ns_printf
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	#echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        GNU_NAME="i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`"
-        NS_NAME="SOLARISx86"
-        NS_PRETTY_NAME="Solaris-x86"
-        NS_RELEASE="`echo ${UNAME_RELEASE}|sed -e 's/[^.]*/2/'`"
-        ns_printf
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	#echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	GNU_NAME="sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`"
-        ns_printf
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	#echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	GNU_NAME="sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`"
-        NS_NAME="SUNOS4"
-        NS_PRETTY_NAME="SunOS"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	#echo mips-dec-ultrix${UNAME_RELEASE}
-	GNU_NAME="mips-dec-ultrix${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	#echo vax-dec-ultrix${UNAME_RELEASE}
-	GNU_NAME="vax-dec-ultrix${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    mips:*:4*:UMIPS)
-	echo mips-mips-riscos4sysv
-	exit 0 ;;
-    mips:*:5*:RISCos)
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
-          if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-           -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-            #echo m88k-dg-dgux${UNAME_RELEASE}
-            GNU_NAME="m88k-dg-dgux${UNAME_RELEASE}"
-          else
-            #echo m88k-dg-dguxbcs${UNAME_RELEASE}
-            GNU_NAME="m88k-dg-dguxbcs${UNAME_RELEASE}"
-          fi
-        else
-          #echo i586-dg-dgux${UNAME_RELEASE}
-          GNU_NAME="i586-dg-dgux${UNAME_RELEASE}"
-        fi
-        ns_printf
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	#echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	GNU_NAME="mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`"
-        NS_NAME="IRIX"
-        NS_RELEASE="`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`"
-        ns_printf
-	exit 0 ;;
-   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i[34]86:AIX:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                # commenting out this test program - unable to execute
-                # cc on some machines...
-		#sed 's/^		//' << EOF >dummy.c
-		##include <sys/systemcfg.h>
-                #
-		#main()
-		#	{
-		#	if (!__power_pc())
-		#		exit(1);
-		#	puts("powerpc-ibm-aix3.2.5");
-		#	exit(0);
-		#	}
-#EOF
-		#${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		#rm -f dummy.c dummy
-		#echo rs6000-ibm-aix3.2.5
-		GNU_NAME="rs6000-ibm-aix3.2.5"
-                NS_RELEASE="3.2.5"
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		#echo rs6000-ibm-aix3.2.4
-		GNU_NAME="rs6000-ibm-aix3.2.4"
-		NS_RELEASE="3.2.4"
-	else
-		#echo rs6000-ibm-aix3.2
-		GNU_NAME="rs6000-ibm-aix3.2"
-		NS_RELEASE="3.2"
-	fi
-        ns_printf
-	exit 0 ;;
-    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=4.${UNAME_RELEASE}
-	fi
-	#echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	GNU_NAME="${IBM_ARCH}-ibm-aix${IBM_REV}"
-        NS_RELEASE="${IBM_REV}"
-        ns_printf
-	exit 0 ;;
-    *:AIX:*:*)
-	#echo rs6000-ibm-aix
-	GNU_NAME="rs6000-ibm-aix"
-        ns_printf
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
-	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	#echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	GNU_NAME="${HP_ARCH}-hp-hpux${HPUX_REV}"
-        NS_NAME="HPUX"
-        NS_PRETTY_NAME="HP-UX"
-        NS_RELEASE="${HPUX_REV}"
-        ns_printf
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	GNU_NAME="${UNAME_MACHINE}-hp-hpux${HPUX_REV}"
-        NS_NAME="HPUX"
-        NS_PRETTY_NAME="HP-UX"
-        NS_RELEASE="${HPUX_REV}"
-        ns_printf
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*C90:*:*:*)
-	echo c90-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
-	#echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-        GNU_NAME="${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}"
-        NS_NAME="BSDI"
-        NS_PRETTY_NAME="BSDI"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	#echo i386-unknown-cygwin32
-        GNU_NAME="i386-unknown-cygwin32"
-        NS_NAME="WINNT"
-        NS_PRETTY_NAME="WinNT"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then
-	  #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	  GNU_NAME="${UNAME_MACHINE}-unknown-linux"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
-	  #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	  GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
-	  #echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
-	  GNU_NAME="${UNAME_MACHINE}-unknown-linuxcoff"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	  GNU_NAME="${UNAME_MACHINE}-unknown-linux"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	  GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  #echo alpha-unknown-linux ; exit 0
-	  GNU_NAME="alpha-unknown-linux"
-          NS_NAME="${UNAME_SYSTEM}"
-          NS_RELEASE="${UNAME_RELEASE}"
-          ns_printf
-          exit 0
-	else
-	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
-  printf ("%s-unknown-linux\n", argv[1]);
-#else
-  printf ("%s-unknown-linuxaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i[34]86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
-	#if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		#echo ${UNAME_MACHINE}-unixware-sysv${UNAME_RELEASE}
-	if grep SCO /usr/include/sco_values.h >/dev/null 2>/dev/null; then
-		#echo ${UNAME_MACHINE}-unknown-unixware${UNAME_VERSION}
-                GNU_NAME="${UNAME_MACHINE}-unknown-unixware${UNAME_VERSION}"
-                NS_NAME="UNIXWARE"
-                NS_PRETTY_NAME="UnixWare"
-                NS_RELEASE="${UNAME_VERSION}"
-                ns_printf
-	else
-		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i[34]86:SCO_SV:3.2:*)
-        if /bin/uname -X 2>/dev/null >/dev/null ; then
-          UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-          (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-          (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-           && UNAME_MACHINE=i586
-          GNU_NAME="${UNAME_MACHINE}-unknown-sco`echo $UNAME_REL|sed -e 's/.*v//`"
-          NS_NAME="SCO"
-          NS_PRETTY_NAME="SCO"
-          NS_RELEASE="`echo $UNAME_REL|sed -e 's/.*v//`"
-          ns_printf
-        fi
-        exit 0 ;;
-    i[34]86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		#echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
-                GNU_NAME="${UNAME_MACHINE}-unknown-sco${UNAME_REL}"
-                NS_NAME="SCO"
-                NS_PRETTY_NAME="SCO"
-                NS_RELEASE="${UNAME_RELEASE}"
-                ns_printf
-	else
-		echo ${UNAME_MACHINE}-unknown-sysv32
-	fi
-	exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-unknown-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    3[34]??/3[34]??:*:4.0:* | 3[34]??/3[34]??,*:*:4.0:*)
-        #uname -p 2>/dev/null | grep Pentium >/dev/null \
-        #  && echo i586-ncr-sysv4 && exit 0 ;;
-        uname -p 2>/dev/null | grep Pentium >/dev/null
-        if [ "$?" -eq 0 ]; then
-          GNU_NAME="i586-ncr-sysv${UNAME_RELEASE}"
-          NS_NAME="NCR"
-          NS_RELEASE="${UNAME_VERSION}"
-          ns_printf
-        else
-          GNU_NAME="unknown-ncr-sysv${UNAME_RELEASE}"
-          NS_NAME="NCR"
-          NS_RELEASE="${UNAME_VERSION}"
-          ns_printf
-        fi
-        exit 0 ;;
-    m680[234]0:LynxOS:2.[23]*:*)
-	echo m68k-lynx-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i[34]86:LynxOS:2.[23]*:*)
-	echo i386-lynx-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.[23]*:*)
-	echo sparc-lynx-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.[23]*:*)
-	echo rs6000-lynx-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	#echo mips-sni-sysv4
-        GNU_NAME="mips-sni-sysv4"
-        NS_NAME="ReliantUNIX"
-        NS_PRETTY_NAME="Sinix"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		#echo ${UNAME_MACHINE}-sni-sysv4
-		GNU_NAME="${UNAME_MACHINE}-sni-sysv4"
-	else
-		#echo ns32k-sni-sysv
-		GNU_NAME="ns32k-sni-sysv"
-	fi
-        ns_printf
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    R?000:*System_V*:*:*)
-	if [ -d /usr/nec ]; then
-	        #echo mips-nec-sysv${UNAME_RELEASE}
-                GNU_NAME="mips-nec-sysv${UNAME_RELEASE}"
-                NS_NAME="NEC"
-                NS_RELEASE="${UNAME_RELEASE}"
-                ns_printf
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    *:NEWS-OS:*:*)
-        GNU_NAME="mips-sony-newsos"
-        NS_NAME="SONY"
-        NS_RELEASE="${UNAME_RELEASE}"
-	exit 0 ;;
-    *86:Windows_NT:4*:*)
-        GNU_NAME="x86-unknown-winnt4"
-        NS_NAME="WINNT"
-        NS_PRETTY_NAME="WinNT"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    *:WINNT:4*:*)
-        GNU_NAME="x86-unknown-winnt4"
-        NS_NAME="WINNT"
-        NS_PRETTY_NAME="WinNT"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-    *:WINNT:*:*)
-        GNU_NAME="x86-unknown-winnt"
-        NS_NAME="WINNT"
-        NS_PRETTY_NAME="WinNT"
-        NS_RELEASE="${UNAME_RELEASE}"
-        ns_printf
-	exit 0 ;;
-esac
-
-echo '(Unable to guess system type)' 1>&2
-
-exit 1
diff --git a/nsarch.bat b/nsarch.bat
deleted file mode 100644
index b53d232..0000000
--- a/nsarch.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@rem // BEGIN COPYRIGHT BLOCK
-@rem // Copyright (C) 2005 Red Hat, Inc.
-@rem // All rights reserved.
-@rem // 
-@rem // This library is free software; you can redistribute it and/or
-@rem // modify it under the terms of the GNU Lesser General Public
-@rem // License as published by the Free Software Foundation version
-@rem // 2.1 of the License.
-@rem //                                                                                  
-@rem // This library is distributed in the hope that it will be useful,
-@rem // but WITHOUT ANY WARRANTY; without even the implied warranty of
-@rem // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-@rem // Lesser General Public License for more details.
-@rem //                                                                                  
-@rem // You should have received a copy of the GNU Lesser General Public
-@rem // License along with this library; if not, write to the Free Software
-@rem // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-@rem // END COPYRIGHT BLOCK
-sh nsarch
diff --git a/nsconfig.mk b/nsconfig.mk
deleted file mode 100644
index df6be2a..0000000
--- a/nsconfig.mk
+++ /dev/null
@@ -1,625 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-# 
-# This library 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
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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.
-#
-all:
-
-# 7/12/96 Adrian - allow MAKEFLAGS to propagate
-# override MAKEFLAGS :=
-
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/component_versions.mk
-
-NSOS_TEST1       := $(shell uname -m)
-ifeq ($(NSOS_ARCH),Linux)
-
-  ifneq (x86_64, $(NSOS_TEST1))
-    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-      # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
-      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)))
-        # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
-        NSOS_TEST1    = x86
-      endif
-    endif
-    NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
-    NSCONFIG_NOTAG  = $(NSCONFIG)
-  else
-# add _64 tag on all platforms except linux/rhel
-    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
-
-MAKE=gmake $(BUILDOPT) NSPR_BASENAME=$(NSPR_BASENAME) USE_PTHREADS=$(USE_PTHREADS) SECURITY=$(SECURITY) MOZILLA_SOURCE_ROOT_EXT=$(MOZILLA_SOURCE_ROOT_EXT) ICU_SOURCE_ROOT_EXT=$(ICU_SOURCE_ROOT_EXT) USE_64=$(USE_64)
-
-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
-
-# ------------------------ Product-specific flags ------------------------
-
-MCC_SERVER += -DNET_SSL -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
-
-# ----------- Default Flags, may be overridden below ------------
-
-CPPCMD=$(CC) -E
-HTTPDSO_NAME=ns-httpd
-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 -----------------------
-
-#------------------
-ifeq ($(ARCH), AIX)
-#------------------
-DLL_PRESUF=
-DLL_SUFFIX=so
-#LDAP_DLL_PRESUF=_shr
-LDAP_DLL_PRESUF=
-LDAP_DLL_SUFFIX=so
-ifeq ($(NSOS_RELEASE), 4.3)
-AIX4_3=-D AIX4_3
-endif
-ifeq ($(USE_64), 1)
-OBJECT_MODE=64 
-export OBJECT_MODE 
-endif
-CC=xlC_r -qarch=com -DAIX -DAIXV3 -DAIXV4 -DSYSV $(AIX4_3)
-CXX=$(CC)
-CCC=$(CC)
-CPPCMD=/usr/ccs/lib/cpp -P
-ARCH_DEBUG=-g
-ARCH_OPT=-O
-RANLIB=ranlib
-NONSHARED_FLAG=-bnso -bI:/lib/syscalls.exp
-EXPORT_FILE=$*.exp
-DEF_LIBPATH=/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-MKSHLIB_FLAGS=-p 0 -blibpath:$(DEF_LIBPATH)
-DLL_LDFLAGS=-bM:SRE -bnoentry -blibpath:$(DEF_LIBPATH)
-# AIX plugins can have unresolved references
-LINK_PLUGIN+=-berok
-LINK_DLL=$(ABS_ROOT)/build/aixmkshlib -o $@ $(MKSHLIB_FLAGS)
-MKSHLIB=$(LINK_DLL)
-EXTRA_LIBS=-ldl
-
-VERITY_ARCH=_rs6k41
-NSAPI_CAPABLE=true
-USE_PTHREADS=0
-DL_LIB =-lsvld
-NSPR_DEFINES += -DNSPR20
-RWTOOLS_VERSION = latest
-HTTPDSO_NAME=libnshttpd
-PEER_ARCH=aix
-JRE_VERSION=jre1.1.6
-
-else
-#-------------------
-ifeq ($(ARCH), HPUX)
-#-------------------
-HPUX_ARCH = $(shell uname -m)
-ifeq ($(HPUX_ARCH), ia64)
-    DLL_SUFFIX=so
-else
-    DLL_SUFFIX=sl
-endif
-LDAP_DLL_SUFFIX=$(DLL_SUFFIX)
-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)
-CXX=/opt/aCC/bin/aCC
-CC=cc -Ae
-ifeq ($(NSOS_RELEASE), B.11.23)
-  CC+=+Olit=all
-  ifeq ($(USE_64), 1)
-    BIT_SWITCH=+DD64
-  else
-    BIT_SWITCH=+DD32
-  endif
-  IPF_CFLAGS=-DPIC
-else # 11.11 or earlier
-  CC+=+ESlit
-  ifeq ($(USE_64), 1)
-    BIT_SWITCH=+DA2.0W +DS2.0
-  else
-    BIT_SWITCH=+DAportable +DS1.1
-  endif
-  IPF_CFLAGS=
-endif # B.11.23
-ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 $(IPF_CFLAGS)
-EXTRA_LIBS= -ldld -lm -lpthread
-else
-CC=cc
-ARCH_CFLAGS=-D_HPUX_SOURCE -Aa +DA1.0 +z
-EXTRA_LIBS= -ldld -lm -ldce
-endif
-
-CCC=$(CXX)
-
-ARCH_DEBUG=-g
-ARCH_OPT=-O
-
-RANLIB=true
-NONSHARED_FLAG=-Wl,-a,archive
-
-#
-# Flags passed to CC to pass onto the linker; separate it from EXTRA_LIBS
-LD_CFLAGS=-Wl,-E $(BIT_SWITCH)
-DLL_CFLAGS=+z
-DLL_LDFLAGS=-b $(BIT_SWITCH)
-NSAPI_CAPABLE=true
-VERITY_ARCH=_hp800
-USE_PTHREADS=0
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
-LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@
-HTTPDSO_NAME=libnshttpd
-PEER_ARCH=hp
-JRE_VERSION=jre1.1.6
-RWTOOLS_VERSION = latest
-
-else
-#--------------------
-ifeq ($(ARCH), Linux)
-#--------------------
-NS_USE_GCC	= 1
-CC=gcc
-CC_VERSION = $(word 1, $(shell $(CC) --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
-CCC=g++
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-#ARCH_CFLAGS=-Wall -DNO_DBM
-#ARCH_CFLAGS=-fPIC -wall -ansi -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -DNO_DBM
-ARCH_CFLAGS=-fPIC -pipe -DLINUX -Dlinux -DBSD -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -DNO_DBM
-USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20 -Di386
-RANLIB=ranlib
-BUILD_IIOPLIB=no
-ifeq ($(USE_PTHREADS), 1)
-  NSPR_DEFINES         += -D_REENTRANT -D_PR_NEED_FAKE_POLL
-endif
-LINK_DLL=$(CC) -shared -o $@
-EXTRA_LIBS=-lpthread -lc -lresolv -ldl
-PEER_ARCH=linux
-JRE_VERSION=jre117_v2_temp
-
-else
-#--------------------
-ifeq ($(ARCH), OSF1)
-#--------------------
-CC=cc
-CCC=cxx
-CXX=cxx
-ARCH_DEBUG=-g
-ARCH_OPT=-O2
-ifeq ($(NSOS_OSF1REV),878)
-  ARCH_CFLAGS=-DOSF1V4D -DIS_64 -ieee_with_inexact -pthread
-else
-  ARCH_CFLAGS=-DIS_64 -ieee_with_inexact -pthread
-endif
-# 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
-EXTRA_LIBS=
-USE_PTHREADS=0
-NSPR_DEFINES += -DNSPR20
-RWTOOLS_VERSION = latest
-PEER_ARCH=osf
-JRE_VERSION=jre1.1.6
-#PEERDIR=$(DEVROOT)/osf/dev
-ADM_RELDATE=19970605
-
-export NO_DB2=1
-export NO_ODBC=1
-
-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/")
-NS_USE_NATIVE=1
-CC=cc
-CXX=CC
-CCC=$(CXX)
-ARCH_OPT=-xO2
-ifeq ($(USE_64), 1)
-BIT_SWITCH=-xarch=v9
-CXX+= $(BIT_SWITCH)
-endif
-ARCH_CFLAGS=$(BIT_SWITCH) -KPIC -DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DOSVERSION=$(OSVERSION)
-ARCH_DEBUG=-g
-RANLIB=true
-
-EXTRA_LIBS = -lthread -lposix4 -lsocket -lnsl -ldl -lresolv -lgen
-
-DLL_LDFLAGS=-G
-NONSHARED_FLAG=-static
-NSAPI_CAPABLE=true
-NLIST=-lelf
-VERITY_ARCH=_solaris
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
-PEER_ARCH=solaris
-JRE_VERSION=jre1.1.7
-
-BUILD_NMC=true
-
-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
-
-DLL_LDFLAGS=-G
-LDAP_VERSION    = oem
-RWTOOLS_VERSION = latest
-ADM_RELDATE     = oem
-AUTOCATALOG_VERSION = oem
-NONSHARED_FLAG=-static
-NSAPI_CAPABLE=true
-NLIST=-lelf
-NO_MSOFT_OBJ=1
-BUILD_WEBPUB=no
-BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20 -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)
-#---------------------
-LIB_SUFFIX=lib
-DLL_SUFFIX=dll
-LDAP_DLL_SUFFIX=$(DLL_SUFFIX)
-PROCESSOR := $(shell uname -p)
-PEER_ARCH=nti31
-JRE_VERSION=jre1.1.8
-ifeq ($(PROCESSOR), I386)
-CPU_ARCH = x386
-VERITY_ARCH=_nti31
-ARCH_OPT=-DNDEBUG -O2
-ifeq ($(DEBUG), fulld)
-CC=cl -nologo -MDd -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo -MDd -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_MBCS -D_AFXDLL -D_RWTOOLSDLL
-else
-CC=cl -nologo -MD -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo -MD -W3 -GT -GX -D_X86_ -Dx386 -DWIN32 -D_WINDOWS -D_MBCS -D_AFXDLL -D_RWTOOLSDLL
-endif
-BUILD_NMC=true
-
-else
-ifeq ($(PROCESSOR), MIPS)
-CPU_ARCH = MIPS
-VERITY_ARCH=verity_is_undefined
-ARCH_OPT=-DNDEBUG -O2
-CC=cl -nologo -MD -W3 -GT -GX -D_MIPS_ -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo -MD -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 -MD -W3 -GT -GX -D_ALPHA=1 -DWIN32 -D_WINDOWS -D_RWTOOLSDLL
-CCP=cl -nologo -MD -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
-ARCH_DEBUG=-D_DEBUG -Od	-Z7
-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 += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU
-
-else
-
-CC=UNKNOWN_SYSTEM_TYPE
-
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-
-ifeq ($(DEBUG), full)
-MCC_DEBUG=-DMCC_DEBUG $(ARCH_DEBUG)
-NSOBJDIR_TAG=_DBG
-ML_DEBUG=$(ARCH_LINK_DEBUG)
-
-else
-ifeq ($(DEBUG), fulld)
-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
-PURIFY=purify $(PUREOPTS)
-
-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     = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
-  endif
-else
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_32  = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
-  NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
-endif
-# platforms without full rtl debugging versions of libraries i.e. not NT
-NSCP_DIST			  := $(ABS_ROOT_PARENT)/dist
-NSCP_DISTDIR          := $(NSCP_DIST)/$(NSOBJDIR_NAME)
-FULL_RTL_OBJDIR 	  := $(NSOBJDIR_NAME)
-NSCP_DISTDIR_FULL_RTL := $(NSCP_DISTDIR)
-
-ifeq ($(ARCH), WINNT)
-	ifeq ($(DEBUG), fulld)
-		NSCP_DISTDIR_FULL_RTL = $(BUILD_ROOT)/../dist/$(FULL_RTL_OBJDIR)
-	endif
-endif
-
-$(NSCP_DISTDIR_FULL_RTL):
-	mkdir -p $@
-
-include $(ABS_ROOT)/components.mk
-
-# ------------------------ The actual build rules ------------------------
-
-# CLEAN THIS UP
-
-RM=rm
-DEPEND=makedepend
-
-ifeq ($ARCH), IRIX)
-STRIP=strip -x
-else
-STRIP=strip
-endif
-
-# AS INCLUDE DEFDINED HERE
-MCC_INCLUDE=-I$(ABS_ROOT)/include $(NSPR_INCLUDE) $(SECURITY_INCLUDE) \
-			$(LDAPSDK_INCLUDE) $(ICU_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 $(ABS_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
-
-ifndef NOSTDCOMPILE
-$(OBJDEST)/%.o: %.cpp
-ifeq ($(ARCH), WINNT)
-	$(CCP) -c $(CFLAGS) $(MCC_INCLUDE) $< -Fo$(OBJDEST)/$*.o
-else
-	$(CCC) -c $(CFLAGS) $(MCC_INCLUDE) $< -o $(OBJDEST)/$*.o
-endif
-endif
-
-ifndef NOSTDCOMPILE
-$(OBJDEST)/%.o: %.c
-ifeq ($(ARCH), WINNT)
-ifeq ($(BOUNDS_CHECKER), yes)
-	bcompile -c -Zop $(ABS_ROOT)/bchecker.ini -nologo -MD -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
-endif
-
-ifeq ($(ARCH), WINNT)
-AR=lib /nologo /out:"$@"
-LINK_DLL	= link /nologo /MAP /DLL /PDB:NONE $(ML_DEBUG) /SUBSYSTEM:WINDOWS $(LLFLAGS) $(DLL_LDFLAGS) /out:"$@"
-LINK_EXE	= link -OUT:"$@" /MAP  $(ARCH_LINK_DEBUG) $(LCFLAGS) /NOLOGO /PDB:NONE /INCREMENTAL:NO \
-                  /SUBSYSTEM:windows $(OBJS) $(DEPLIBS) $(EXTRA_LIBS)
-BSCMAKE = bscmake.exe /nologo /o $@
-endif # WINNT
-
-ifndef NOSTDCLEAN
-clean:
-	$(RM) -f .depends.$(NSOBJDIR_NAME)  $(LIBS) $(OBJDEST)/*.o *_pure_* $(BINS) $(PUREFILES)
-endif
-
-ifndef NOSTDDEPEND
-ifeq ($(ARCH), WINNT)
-INCLUDE_DEPENDS = $(NULL)
-depend:
-	echo making depends
-else
-INCLUDE_DEPENDS = .depends.$(NSOBJDIR_NAME)
-.depends.$(NSOBJDIR_NAME):
-	touch .depends.$(NSOBJDIR_NAME)
-
-depend:
-	$(DEPEND) -f.depends.$(NSOBJDIR_NAME) -- $(MCC_INCLUDE) $(CFLAGS) *.c *.cpp
-endif
-endif
-
-ifndef NOSTDSTRIP
-strip:
-	$(STRIP) $(BINS)
-endif
-
-########################################
-# ADMINUTIL
-########################################
-
-ADMSDK_SO_VERSION=10
-ADMSDK_SO_DOTVERSION=1.0
-ADMSDK_SO_MAJORVERSION=1
-ADMSDKOBJDIR=$(OBJDIR)
-ADMSDK_LIBPATH = $(ADMSDKOBJDIR)/lib
-ADMSDK_INCLUDE = $(ADMSDKOBJDIR)/include
-
-ifeq ($(ARCH), WINNT)
-	ADMSDK_LIBNAMES = libadminutil$(ADMSDK_SO_VERSION)
-	ADMSDK_LIBS = $(addsuffix .lib,  $(ADMSDK_LIBNAMES))
-	ADMSDKDLL_NAMES = $(addsuffix .dll, $ADMSDK_LIBNAMES))
-	ADMSDKLINK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS))
-else
-	ADMSDK_LIBNAMES = adminutil
-	ADMSDK_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMSDK_LIBNAMES)))
-	LIBADMSDK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS))
-	ADMSDKLINK = -L$(ADMSDK_LIBPATH) $(addprefix -l, $(ADMSDK_LIBNAMES))
-endif
-
diff --git a/nscore.mk b/nscore.mk
deleted file mode 100644
index 6ddcf39..0000000
--- a/nscore.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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
-# 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), 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 d20d1ad..0000000
--- a/nsdefs.mk
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 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]
-# BUILD_MODULE=[HTTP_ADMIN, HTTP_PERSONAL, HTTP_ENTERPRISE, ...]
-# BUILD_SECURITY=[none, export, domestic]
-
-ABS_ROOT := $(shell cd $(BUILD_ROOT); pwd)
-ABS_ROOT_PARENT := $(shell cd $(ABS_ROOT)/..; pwd)
-RELTOOLSPATH = $(ABS_ROOT_PARENT)/reltools
-
-TMP_ARCH := $(shell uname -s)
-RELEASE := $(shell uname -r)
-ifeq ($(TMP_ARCH), WINNT)
-BUILD_ARCH := $(shell uname -s)
-else
-BUILD_ARCH := $(shell $(ABS_ROOT)/nsarch)
-endif
-
-NSOS_TEST1 := $(shell uname -m)
-
-PKG_ARCH=$(BUILD_ARCH)
-
-PUMPKIN_AGE := 90
-BUILD_BOMB=
-#BUILD_BOMB=-DPUMPKIN_HOUR=$(shell cat $(ABS_ROOT)/pumpkin.dat)
-BUILD_CHECKER=no
-BUILD_DEBUG=full
-BUILD_MODULE=HTTP_ADMIN
-BUILD_NSPR_THREADS=yes
-BUILD_SECURITY=domestic
-ifeq ($(USE_PTHREADS), 1)
-  ifeq ($(USE_N32), 1)
-     BUILD_PTHREADS=-n32-pth
-  else
-     BUILD_PTHREADS=-pth
-  endif
-else
-  BUILD_PTHREADS=
-endif
-
-ifeq ($(USE_64), 1)
-  NS64TAG = _64
-else
-  ifeq ($(BUILD_ARCH), HPUX)
-	ifeq ($(NSOS_TEST1),ia64)
-	  NS64TAG=_32
-	endif
-  endif
-endif
-
-PRETTY_ARCH := $(shell uname -s)
- 
-NSOS_ARCH         := $(subst /,_,$(shell uname -s))
-
-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),WINNT)
-LIB_SUFFIX = lib
-else
-LIB_SUFFIX = a
-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
-else
-ifneq ($(NSOS_ARCH), RHEL)
-NSOS_RELEASE      := $(shell uname -r)
-endif
-
-#
-# 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
-ifeq ($(NSOS_ARCH), Linux)
-NSOS_RELEASE      := $(basename $(NSOS_RELEASE))
-endif
-endif
-
-# Get OSF's OS revision number to figure out the OS release
-ifeq ($(NSOS_ARCH),OSF1)
-  NSOS_RELEASE1      := $(shell uname -r)
-  NSOS_OSF1REV       := $(shell uname -v)
-  ifeq ($(NSOS_OSF1REV),878)
-    NSOS_RELEASE := $(NSOS_RELEASE1)D
-  else
-    ifeq ($(NSOS_OSF1REV),564)
-      NSOS_RELEASE := $(NSOS_RELEASE1)B
-    else
-      ifeq ($(NSOS_OSF1REV),464)
-        NSOS_RELEASE := $(NSOS_RELEASE1)A
-      else
-        NSOS_RELEASE := $(NSOS_RELEASE1)
-      endif
-    endif
-  endif
-endif
-
-ifeq ($(NSOS_ARCH), SunOS)
-  ifeq ($(shell uname -m), i86pc)
-    NSOS_MACHINE := _i86pc
-  endif
-endif
-
-NSPLATFORM_ID = $(NSOS_ARCH)$(NSOS_RELEASE)$(NSOS_MACHINE)$(NS64TAG)
-
-ifneq ($(NO_BUILD_NUM), true)
-GET_BUILD_NUM := $(shell cat $(ABS_ROOT)/$(NSPLATFORM_ID)/buildnum.dat)
-endif
-
-ifdef REL_BUILD
-INTGBUILD=0
-else
-INTGBUILD=1
-endif
-
-ifeq ($(BUILD_ARCH), WINNT)
-  BUILD_DLL_VERSION=yes
-  BUILD_HTTPDLL_NAME=ns-httpd30
-  BUILD_ADMIN_NAME=ns-admin40
-  PERL_ARCH=$(shell uname -p)
-  PERL=perl
-
-  ZIP_ROOT=$(ABS_ROOT)/infozip
-  PROCESSOR:=$(shell uname -p)
-  ifeq ($(PROCESSOR), I386)
-    ZIPDIR=$(ZIP_ROOT)/i386
-  else
-    ifeq ($(PROCESSOR), MIPS)
-      ZIPDIR=$(ZIP_ROOT)/mips
-    else
-      ifeq ($(PROCESSOR), ALPHA)
-        ZIPDIR=$(ZIP_ROOT)/alpha
-      else
-        ZIP_DIR=$(PROCESSOR)-is-not-supported-for-processor
-      endif
-    endif
-  endif
-
-  ZIP=$(ZIPDIR)/zip.exe
-  UNZIP = $(ZIPDIR)/unzip.exe -o
-
-else
-  PERL:=/usr/bin/env perl
-  ZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/zip
-  UNZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/unzip -o
-  IZIP  = $(ZIP) -ry9uT
-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_BOMB=$(BUILD_BOMB)
-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.
-#
-ARCH=$(BUILD_ARCH)
-SECURITY=$(BUILD_SECURITY)
-DEBUG=$(BUILD_DEBUG)
-BOMB=$(BUILD_BOMB)
-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
-
-MAJOR_VERSION:="1"
-MINOR_VERSION:="0"
-ADMSDK_VERSION:=1.0
-LDAP_NO_LIBLCACHE:=1
-
-DIRVERDIR=$(COMMON_OBJDIR)/include
-DIRVER_H=$(DIRVERDIR)/dirver.h
-
-ADMINUTILSPEC=$(OBJDIR)/adminutil.spec
-
-#
-# -- Default Section --------------------------------------------------------
-#
-# Some of the _OBJDIR is maintained for backward compatibility until they
-# are all cleaned up.  
-#
-
-ifndef OBJDIR
-OBJDIR=$(ABS_ROOT)/built/$(FULL_RTL_OBJDIR)
-endif
-
-ifndef COMMON_OBJDIR
-COMMON_OBJDIR=$(OBJDIR)
-endif
-
-ifndef ADMSERV_OBJDIR
-ADMSERV_OBJDIR=$(OBJDIR)
-endif
diff --git a/nsftp.sh b/nsftp.sh
deleted file mode 100644
index e56e747..0000000
--- a/nsftp.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-# FTP script for downloading /share/builds/components stuff.
-#
-# syntax:
-#      nsftp <srcdir-relative to /share/builds/components> <destdir>
-#
-# Example 
-#
-#      nsftp ldapsdk/19961108 c:\3.0\ns\components\ldapsdk
-#
-
-SERVER=elfgrass.mcom.com
-USER=ftpman
-PASSWD=ftpman
-TMPFILE=tmp.foo
-
-SRC=$1
-DEST=$2
-if [ -z $3 ]; then 
-  FILENAME=*
-else
-  FILENAME=$3
-fi
-
-echo ${USER}
-
-cd ${DEST}
-ftp -n ${SERVER} << -=EOF=-
-user ${USER} ${PASSWD}
-binary
-hash
-prompt
-cd ${SRC}
-mget ${FILENAME}
-quit
--=EOF=-
-
diff --git a/nsperl.mk b/nsperl.mk
deleted file mode 100755
index 329d2ac..0000000
--- a/nsperl.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-#
-# These are the perl values to be used
-#
-# Individual modules may override them
-#
-all:
-
-OSVER=$(NSOS_ARCH)$(NSOS_RELEASE)
-
-ifeq ($(ARCH), WINNT)
-PERL5=perl
-endif
-ifeq ($(OSVER), OSF1V4.0D)
-PERL5=/h/tortoise/export/share/builds/tools/alpha_dec_osf4.0/perl5.004/bin/perl
-endif
-ifeq ($(OSVER), AIX4.3) 
-PERL5=/u/robobld/nsperl/aix/nsperl
-endif
-ifeq ($(OSVER), AIX4.2) 
-PERL5=/u/robobld/nsperl/aix/nsperl
-endif
-ifeq ($(OSVER), AIX4.1)
-PERL5=/u/robobld/nsperl/aix/nsperl
-endif
-ifeq ($(OSVER), IRIX6.5)	
-PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin/perl5
-endif
-ifeq ($(OSVER), IRIX6.2)
-PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin/perl5
-endif
-ifeq ($(OSVER),SunOS5.6)
-PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
-endif
-ifeq ($(OSVER),SunOS5.8)
-  SUNOS_ARCH = $(shell uname -m)
-  ifeq ($(SUNOS_ARCH), i86pc)
-    PERL5=/opt/usr/local/perl5/bin/perl
-  else
-    PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
-  endif
-endif
-ifeq ($(OSVER),SunOS5.9)
-  SUNOS_ARCH = $(shell uname -m)
-  PERL5:=/usr/bin/env perl
-endif
-ifeq ($(OSVER),SunOS5.5.1)
-PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
-endif
-ifeq ($(OSVER), HP-UXB.11.00)	
-PERL5=/u/robobld/nsperl/hpux/nsperl
-endif	
-ifeq ($(OSVER), HP-UXB.10.10)	
-PERL5=/u/robobld/nsperl/hpux/nsperl
-endif
-ifeq ($(OSVER), HP-UXB.11.11)	
-PERL5=/u/robobld/nsperl/hpux/nsperl
-endif
-ifeq ($(OSVER), HP-UXB.11.23)	
-PERL5=/usr/bin/env perl
-endif
-ifeq ($(BUILD_ARCH), Linux)
-PERL5:=/usr/bin/env perl
-endif
diff --git a/ntbomb.pl b/ntbomb.pl
deleted file mode 100644
index 28314b5..0000000
--- a/ntbomb.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-$NSDEFS_FILE=$ARGV[0];
-$PRODINFO_NAME=$ARGV[1];
-$BOMB_VALUE=`grep '^BOMB=' $NSDEFS_FILE | cut -f3 -d=`;
-
-open(PRODINFO_FILE, ">$PRODINFO_NAME"); 
-if($BOMB_VALUE eq "") {
-    print PRODINFO_FILE "\r\n";
-} elsif($BOMB_VALUE eq "\n") {
-    print PRODINFO_FILE "\r\n";
-} else {
-    print PRODINFO_FILE "Expires $BOMB_VALUE";
-}
diff --git a/pkgadminutil.mk b/pkgadminutil.mk
deleted file mode 100644
index 4b74ad0..0000000
--- a/pkgadminutil.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-#
-# Makefile to Create Admin Util packages
-#
-
-BUILD_ROOT:=.
-include $(BUILD_ROOT)/nsdefs.mk
-include $(BUILD_ROOT)/nsconfig.mk
-
-MKDIR=mkdir -p
-TMPLIST := $(shell echo /tmp/build.$$$$)
-
-# Destination directories for package
-PKGDIR_NAME=$(FULL_RTL_OBJDIR)
-PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME)
-PKGDIR=$(PKGTOP)
-
-ifdef BUILD_INTL
-PKGDIR_NAME+=-intl
-PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME)
-PKGDIR=$(PKGTOP)
-endif
-
-ifndef INSTDIR
-    MMDD := $(shell date +%m.%d)
-    INSTDIR := $(ABS_ROOT)/../$(MMDD)
-    PKGINSTDIR := $(ABS_ROOT)/../$(MMDD)/$(PKGDIR_NAME)
-endif
-ABS_INSTDIR := $(shell if test \! -f $(INSTDIR); then mkdir $(INSTDIR); fi; cd $(INSTDIR); pwd)
-ABS_PKGINSTDIR := $(shell if test \! -f $(PKGINSTDIR); then mkdir $(PKGINSTDIR); fi; cd $(PKGINSTDIR); pwd)
-INCL_ADMINUTIL := adminutil-1.0
-PROP_ADMINUTIL := adminutil-properties
-
-# set the values of the macros used by rpmbuild
-# name and version of RPM - must correspond to the spec file - these get branded
-RPM_VERSION=1.0
-RPM_FILE_BASE=adminutil-$(RPM_VERSION)
-RPM_ARCH = $(shell uname -i)
-# root dir for RPM built and temp files
-ABS_TOPDIR = $(ABS_INSTDIR)
-RPM_TOPDIR = --define "_topdir $(ABS_TOPDIR)"
-# location of source tarball
-RPM_SOURCEDIR = --define "_sourcedir $(ABS_TOPDIR)"
-# location of staging area built into RPM
-RPM_BUILDDIR = --define "_builddir $(ABS_PKGINSTDIR)"
-# location of final RPM file
-RPM_RPMDIR = --define "_rpmdir $(ABS_TOPDIR)"
-# location of source RPM
-RPM_SRPMDIR = --define "_srcrpmdir $(ABS_TOPDIR)"
-ifneq ($(BUILD_DEBUG), optimize)
-	RPM_FLAVOR = dbg
-else
-	RPM_FLAVOR = opt
-endif
-
-all: pkguxAdminUtil pkgSBC pkgRPM
-
-pkguxAdminUtil:
-
-	rm -rf $(PKGDIR)
-	-$(MKDIR) $(PKGDIR)
-	-$(MKDIR) $(PKGDIR)/include
-	-$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil
-	-$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
-	-$(MKDIR) $(PKGDIR)/lib
-	-$(MKDIR) $(PKGDIR)/lib/$(PROP_ADMINUTIL)
-
-	cp -p $(ABS_ROOT)/include/libadminutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil 
-	cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
-# Don't package sslpset.h
-	rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h
-	@cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xvf -)
-	cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res  $(PKGDIR)/lib/$(PROP_ADMINUTIL)
-
-pkgSBC:
-	-$(RM) -rf $(ABS_PKGINSTDIR)
-	-$(MKDIR) $(ABS_PKGINSTDIR)
-	cp -r $(PKGDIR)/lib $(ABS_PKGINSTDIR)
-	cp -r $(PKGDIR)/include $(ABS_PKGINSTDIR)
-	cd $(ABS_PKGINSTDIR); tar -cvf - * | gzip -c > adminutil.tar.gz
-# create a source tar ball (ABS_INSTDIR is always new and clean)
-ifneq ($(ARCH), WINNT)
-	cd $(ABS_INSTDIR); \
-	if [ -h $(RPM_FILE_BASE) ] ; then rm -rf $(RPM_FILE_BASE) ; fi ; \
-	ln -s $(ABS_ROOT) $(RPM_FILE_BASE); \
-	echo $(RPM_FILE_BASE)/built > $(TMPLIST) ; \
-	find $(RPM_FILE_BASE)/* -name "CVS" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
-	find $(RPM_FILE_BASE)/* -name "HP-UX*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
-	find $(RPM_FILE_BASE)/* -name "SunOS*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
-	find $(RPM_FILE_BASE)/* -name "RHEL*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
-	find $(RPM_FILE_BASE)/* -name "Linux*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \
-	tar cfh - -X $(TMPLIST) $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz; \
-	rm -rf $(RPM_FILE_BASE)
-	rm -rf $(TMPLIST)
-endif
-
-pkgRPM: 
-ifdef BUILD_RPM
-# make a spec file (it's moved to OBJDIR)
-	$(MAKE) -C $(ABS_ROOT) $(ADMINUTILSPEC)
-	rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(ADMINUTILSPEC)
-	cd $(ABS_INSTDIR); rm -f $(RPM_FILE_BASE).tar.gz
-endif # BUILD_RPM
diff --git a/pumpkin.pl b/pumpkin.pl
deleted file mode 100644
index 61129f3..0000000
--- a/pumpkin.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-
-# NT doesn't reliably do perl -e, so we have to do this.
-die "Usage: $0 <days> <file>\n" unless $#ARGV == 1;
-
-open( PUMPKIN, ">$ARGV[1]" ) || die "Can't create $ARGV[1]: $!\n";
-print PUMPKIN time + $ARGV[0] * 24 * 60 * 60;
-close( PUMPKIN );
diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index 17527c7..0000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#                                                                                  
-# This library 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
-# Lesser General Public License for more details.
-#                                                                                  
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
-#
-
-BUILD_ROOT=..
-
-include ../nsconfig.mk
-
-OBJDEST:=$(OBJDIR)/tests
-
-OBJS:=$(OBJDEST)/retrieveSIE
-
-all: $(OBJDEST) $(OBJS)
-
-$(OBJDEST)/retrieveSIE: retrieveSIE.c
-	$(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil
-
-$(OBJDEST):
-	-mkdir $(OBJDEST)
-
-run: $(OBJDEST) $(OBJS)
-	LD_LIBRARY_PATH=$(NSPR_LIBPATH):$(LDAPSDK_LIBPATH):$(ICU_LIBPATH):$(OBJDIR)/lib $(OBJDEST)/retrieveSIE $(SERVER_ROOT)