Unchunder the ^M characters.

15 files changed, 1786 insertions, 1786 deletions

diff --git a/security/coreconf/makefile.win b/security/coreconf/makefile.win
index 52d87f47d..c3abce76b 100644
--- a/security/coreconf/makefile.win
+++ b/security/coreconf/makefile.win
@@ -1,100 +1,100 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-#

-# An NMAKE file to set up and adjust coreconf's build system for

-# Client build.  Client build should invoke NMAKE on this file

-# instead of invoking gmake directly.

-#

-

-NS_DEPTH = ..

-include <$(NS_DEPTH)\config\config.mak>

-#include <$(NS_DEPTH)\config\rules.mak>

-

-#

-# Backslashes are escape characters to gmake, so flip all backslashes

-# in $(MOZ_TOOLS) to forward slashes and pass that to gmake.

-#

-

-GMAKE = $(MOZ_TOOLS)\bin\gmake.exe MOZ_TOOLS_FLIPPED=$(MOZ_TOOLS:\=/)

-

-GMAKE = $(GMAKE) PR_CLIENT_BUILD=1 PR_CLIENT_BUILD_WINDOWS=1

-

-#

-# The Client's debug build uses MSVC's debug runtime library (/MDd).

-#

-

-!ifdef MOZ_DEBUG

-GMAKE = $(GMAKE) USE_DEBUG_RTL=1

-!else

-GMAKE = $(GMAKE) BUILD_OPT=1

-!endif

-

-!if "$(MOZ_BITS)" == "16"

-GMAKE = $(GMAKE) OS_TARGET=WIN16

-!else

-

-GMAKE = $(GMAKE) OS_TARGET=WIN95

-!ifdef MOZ_DEBUG

-PR_OBJDIR = WIN954.0_DBG.OBJD

-!else

-PR_OBJDIR = WIN954.0_OPT.OBJ

-!endif

-

-!endif

-

-#

-# The rules.  Simply invoke gmake with the same target

-# for Win16, use the watcom compiler with the MSVC headers and libs

-#

-

-# this rule is needed so that nmake with no explicit target will only build

-# all, and not build all the targets named below in succession!

-default:: all

-

-# a rule like this one must only be used for explicitly named targets!

-all depend export libs install clobber clobber_all clean::

-!if "$(MOZ_BITS)" == "16"

-	set PATH=%WATCPATH%

-	set INCLUDE=%MSVC_INC%

-	set LIB=%MSVC_LIB%

-!endif

-	$(GMAKE) $@

-!if "$(MOZ_BITS)" == "16"

-	set PATH=%MSVCPATH%

-	set INCLUDE=%MSVC_INC%

-	set LIB=%MSVC_LIB%

-!endif

-

-show:

-	@echo "MAKEFLAGS = $(MAKEFLAGS)"

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#
+# An NMAKE file to set up and adjust coreconf's build system for
+# Client build.  Client build should invoke NMAKE on this file
+# instead of invoking gmake directly.
+#
+
+NS_DEPTH = ..
+include <$(NS_DEPTH)\config\config.mak>
+#include <$(NS_DEPTH)\config\rules.mak>
+
+#
+# Backslashes are escape characters to gmake, so flip all backslashes
+# in $(MOZ_TOOLS) to forward slashes and pass that to gmake.
+#
+
+GMAKE = $(MOZ_TOOLS)\bin\gmake.exe MOZ_TOOLS_FLIPPED=$(MOZ_TOOLS:\=/)
+
+GMAKE = $(GMAKE) PR_CLIENT_BUILD=1 PR_CLIENT_BUILD_WINDOWS=1
+
+#
+# The Client's debug build uses MSVC's debug runtime library (/MDd).
+#
+
+!ifdef MOZ_DEBUG
+GMAKE = $(GMAKE) USE_DEBUG_RTL=1
+!else
+GMAKE = $(GMAKE) BUILD_OPT=1
+!endif
+
+!if "$(MOZ_BITS)" == "16"
+GMAKE = $(GMAKE) OS_TARGET=WIN16
+!else
+
+GMAKE = $(GMAKE) OS_TARGET=WIN95
+!ifdef MOZ_DEBUG
+PR_OBJDIR = WIN954.0_DBG.OBJD
+!else
+PR_OBJDIR = WIN954.0_OPT.OBJ
+!endif
+
+!endif
+
+#
+# The rules.  Simply invoke gmake with the same target
+# for Win16, use the watcom compiler with the MSVC headers and libs
+#
+
+# this rule is needed so that nmake with no explicit target will only build
+# all, and not build all the targets named below in succession!
+default:: all
+
+# a rule like this one must only be used for explicitly named targets!
+all depend export libs install clobber clobber_all clean::
+!if "$(MOZ_BITS)" == "16"
+	set PATH=%WATCPATH%
+	set INCLUDE=%MSVC_INC%
+	set LIB=%MSVC_LIB%
+!endif
+	$(GMAKE) $@
+!if "$(MOZ_BITS)" == "16"
+	set PATH=%MSVCPATH%
+	set INCLUDE=%MSVC_INC%
+	set LIB=%MSVC_LIB%
+!endif
+
+show:
+	@echo "MAKEFLAGS = $(MAKEFLAGS)"
diff --git a/security/nss/cmd/atob/makefile.win b/security/nss/cmd/atob/makefile.win
index e17054c34..ecccc7bf3 100644
--- a/security/nss/cmd/atob/makefile.win
+++ b/security/nss/cmd/atob/makefile.win
@@ -1,155 +1,155 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = atob

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-# awt3240.lib 		# brpref32.lib 		# cert32.lib

-# crypto32.lib 		# dllcom.lib 		# editor32.lib

-# edpref32.lib 		# edtplug.lib 		# font.lib

-# hash32.lib 		# htmldg32.lib 		# img32.lib

-# javart32.lib 		# jbn3240.lib 		# jdb3240.lib

-# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib

-# jrt3240.lib 		# js3240.lib 		# jsd3240.lib

-# key32.lib 		# libapplet32.lib 	# libnjs32.lib

-# libnsc32.lib 		# libreg32.lib 		# mm3240.lib

-# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib

-# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib

-# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib

-# prefui32.lib 		# prefuuid.lib 		# secmod32.lib

-# secnav32.lib 		# secutl32.lib 		# softup32.lib

-# sp3240.lib 		# ssl32.lib 		# uni3200.lib

-# unicvt32.lib 		# win32md.lib 		# winfont.lib

-# xppref32.lib 		# zlib32.lib

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj

-# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp

-# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch

-# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll

-# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj

-# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = atob
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+# awt3240.lib 		# brpref32.lib 		# cert32.lib
+# crypto32.lib 		# dllcom.lib 		# editor32.lib
+# edpref32.lib 		# edtplug.lib 		# font.lib
+# hash32.lib 		# htmldg32.lib 		# img32.lib
+# javart32.lib 		# jbn3240.lib 		# jdb3240.lib
+# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib
+# jrt3240.lib 		# js3240.lib 		# jsd3240.lib
+# key32.lib 		# libapplet32.lib 	# libnjs32.lib
+# libnsc32.lib 		# libreg32.lib 		# mm3240.lib
+# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib
+# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib
+# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib
+# prefui32.lib 		# prefuuid.lib 		# secmod32.lib
+# secnav32.lib 		# secutl32.lib 		# softup32.lib
+# sp3240.lib 		# ssl32.lib 		# uni3200.lib
+# unicvt32.lib 		# win32md.lib 		# winfont.lib
+# xppref32.lib 		# zlib32.lib
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj
+# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp
+# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch
+# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll
+# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj
+# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/btoa/makefile.win b/security/nss/cmd/btoa/makefile.win
index 8ca9994ac..28d3ee873 100644
--- a/security/nss/cmd/btoa/makefile.win
+++ b/security/nss/cmd/btoa/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-# 

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = btoa

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = btoa
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/certutil/makefile.win b/security/nss/cmd/certutil/makefile.win
index 5bfa7b00c..26cdc0651 100644
--- a/security/nss/cmd/certutil/makefile.win
+++ b/security/nss/cmd/certutil/makefile.win
@@ -1,155 +1,155 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-PROGRAM = certutil

-PROGRAM	= $(OBJDIR)\$(PROGRAM).exe

-

-include <$(DEPTH)\config\config.mak>

-

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-# awt3240.lib 		# brpref32.lib 		# cert32.lib

-# crypto32.lib 		# dllcom.lib 		# editor32.lib

-# edpref32.lib 		# edtplug.lib 		# font.lib

-# hash32.lib 		# htmldg32.lib 		# img32.lib

-# javart32.lib 		# jbn3240.lib 		# jdb3240.lib

-# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib

-# jrt3240.lib 		# js3240.lib 		# jsd3240.lib

-# key32.lib 		# libapplet32.lib 	# libnjs32.lib

-# libnsc32.lib 		# libreg32.lib 		# mm3240.lib

-# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib

-# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib

-# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib

-# prefui32.lib 		# prefuuid.lib 		# secmod32.lib

-# secnav32.lib 		# secutl32.lib 		# softup32.lib

-# sp3240.lib 		# ssl32.lib 		# uni3200.lib

-# unicvt32.lib 		# win32md.lib 		# winfont.lib

-# xppref32.lib 		# zlib32.lib

-

-include <$(DEPTH)\config\rules.mak>

-

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj

-# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp

-# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch

-# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll

-# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj

-# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+PROGRAM = certutil
+PROGRAM	= $(OBJDIR)\$(PROGRAM).exe
+
+include <$(DEPTH)\config\config.mak>
+
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+# awt3240.lib 		# brpref32.lib 		# cert32.lib
+# crypto32.lib 		# dllcom.lib 		# editor32.lib
+# edpref32.lib 		# edtplug.lib 		# font.lib
+# hash32.lib 		# htmldg32.lib 		# img32.lib
+# javart32.lib 		# jbn3240.lib 		# jdb3240.lib
+# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib
+# jrt3240.lib 		# js3240.lib 		# jsd3240.lib
+# key32.lib 		# libapplet32.lib 	# libnjs32.lib
+# libnsc32.lib 		# libreg32.lib 		# mm3240.lib
+# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib
+# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib
+# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib
+# prefui32.lib 		# prefuuid.lib 		# secmod32.lib
+# secnav32.lib 		# secutl32.lib 		# softup32.lib
+# sp3240.lib 		# ssl32.lib 		# uni3200.lib
+# unicvt32.lib 		# win32md.lib 		# winfont.lib
+# xppref32.lib 		# zlib32.lib
+
+include <$(DEPTH)\config\rules.mak>
+
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj
+# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp
+# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch
+# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll
+# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj
+# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/checkcert/makefile.win b/security/nss/cmd/checkcert/makefile.win
index f918a62f4..ff1fe62a7 100644
--- a/security/nss/cmd/checkcert/makefile.win
+++ b/security/nss/cmd/checkcert/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = checkcert

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = checkcert
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/crlutil/makefile.win b/security/nss/cmd/crlutil/makefile.win
index df2d72572..1f1b627ff 100644
--- a/security/nss/cmd/crlutil/makefile.win
+++ b/security/nss/cmd/crlutil/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = crlutil

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = crlutil
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/derdump/makefile.win b/security/nss/cmd/derdump/makefile.win
index 578d15f91..9a9d4edef 100644
--- a/security/nss/cmd/derdump/makefile.win
+++ b/security/nss/cmd/derdump/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = derdump

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = derdump
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/digest/makefile.win b/security/nss/cmd/digest/makefile.win
index 7b5969e25..e8ec27ca2 100644
--- a/security/nss/cmd/digest/makefile.win
+++ b/security/nss/cmd/digest/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = digest

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = digest
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/lib/makefile.win b/security/nss/cmd/lib/makefile.win
index f4a91d5cc..92081a2f8 100644
--- a/security/nss/cmd/lib/makefile.win
+++ b/security/nss/cmd/lib/makefile.win
@@ -1,66 +1,66 @@
-#

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-include <manifest.mn>

-

-include <$(DEPTH)\config\config.mak>

-

-# include files are aought in LINCS and INCS.  

-# LINCS are generated from REQUIRES in manigest.mn

-INCS	= $(INCS) \

- -I..\include \

- -I..\..\lib\cert \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)\dist\public\security \

- -I$(DEPTH)\dist\public\nspr \

- -I$(DEPTH)\cmd\winfe \

- $(NULL)

-

-LCFLAGS = -DUSE_SSL -DEXPORT_VERSION

-

-PDBFILE	= $(LIBNAME).pdb

-

-# work around a bug in rules.mak

-LIBRARY_SUFFIX	= $(MOZ_BITS)

-

-include <$(DEPTH)\config\rules.mak>

-

-install:: $(LIBRARY)

-#    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib

-

-

-symbols::

-	@echo "LIBRARY_NAME	is $(LIBRARY_NAME)"

-	@echo "LIBRARY		is $(LIBRARY)"

+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+include <manifest.mn>
+
+include <$(DEPTH)\config\config.mak>
+
+# include files are aought in LINCS and INCS.  
+# LINCS are generated from REQUIRES in manigest.mn
+INCS	= $(INCS) \
+ -I..\include \
+ -I..\..\lib\cert \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)\dist\public\security \
+ -I$(DEPTH)\dist\public\nspr \
+ -I$(DEPTH)\cmd\winfe \
+ $(NULL)
+
+LCFLAGS = -DUSE_SSL -DEXPORT_VERSION
+
+PDBFILE	= $(LIBNAME).pdb
+
+# work around a bug in rules.mak
+LIBRARY_SUFFIX	= $(MOZ_BITS)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+#    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+
+symbols::
+	@echo "LIBRARY_NAME	is $(LIBRARY_NAME)"
+	@echo "LIBRARY		is $(LIBRARY)"
diff --git a/security/nss/cmd/makefile.win b/security/nss/cmd/makefile.win
index 33d1eaf3b..5e506590b 100644
--- a/security/nss/cmd/makefile.win
+++ b/security/nss/cmd/makefile.win
@@ -1,48 +1,48 @@
-#

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-include <$(DEPTH)\config\config.mak>

-

-include <$(DEPTH)\config\rules.mak>

-

-objs:	$(OBJS)

-

-programs: $(PROGRAM)

-

-syms:

-	@echo "OBJS is $(OBJS)"

-	@echo "INCS is $(INCS)"

-

+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+include <$(DEPTH)\config\config.mak>
+
+include <$(DEPTH)\config\rules.mak>
+
+objs:	$(OBJS)
+
+programs: $(PROGRAM)
+
+syms:
+	@echo "OBJS is $(OBJS)"
+	@echo "INCS is $(INCS)"
+
diff --git a/security/nss/cmd/makepqg/makefile.win b/security/nss/cmd/makepqg/makefile.win
index 03fd12421..462448d73 100644
--- a/security/nss/cmd/makepqg/makefile.win
+++ b/security/nss/cmd/makepqg/makefile.win
@@ -1,156 +1,156 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-PROGRAM = makepqg

-PROGRAM	= $(OBJDIR)\$(PROGRAM).exe

-

-include <$(DEPTH)\config\config.mak>

-

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I$(DEPTH)/security/lib/crypto \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-# awt3240.lib 		# brpref32.lib 		# cert32.lib

-# crypto32.lib 		# dllcom.lib 		# editor32.lib

-# edpref32.lib 		# edtplug.lib 		# font.lib

-# hash32.lib 		# htmldg32.lib 		# img32.lib

-# javart32.lib 		# jbn3240.lib 		# jdb3240.lib

-# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib

-# jrt3240.lib 		# js3240.lib 		# jsd3240.lib

-# key32.lib 		# libapplet32.lib 	# libnjs32.lib

-# libnsc32.lib 		# libreg32.lib 		# mm3240.lib

-# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib

-# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib

-# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib

-# prefui32.lib 		# prefuuid.lib 		# secmod32.lib

-# secnav32.lib 		# secutl32.lib 		# softup32.lib

-# sp3240.lib 		# ssl32.lib 		# uni3200.lib

-# unicvt32.lib 		# win32md.lib 		# winfont.lib

-# xppref32.lib 		# zlib32.lib

-

-include <$(DEPTH)\config\rules.mak>

-

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj

-# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp

-# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch

-# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll

-# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj

-# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+PROGRAM = makepqg
+PROGRAM	= $(OBJDIR)\$(PROGRAM).exe
+
+include <$(DEPTH)\config\config.mak>
+
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I$(DEPTH)/security/lib/crypto \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+# awt3240.lib 		# brpref32.lib 		# cert32.lib
+# crypto32.lib 		# dllcom.lib 		# editor32.lib
+# edpref32.lib 		# edtplug.lib 		# font.lib
+# hash32.lib 		# htmldg32.lib 		# img32.lib
+# javart32.lib 		# jbn3240.lib 		# jdb3240.lib
+# jmc.lib 		# jpeg3240.lib 		# jpw3240.lib
+# jrt3240.lib 		# js3240.lib 		# jsd3240.lib
+# key32.lib 		# libapplet32.lib 	# libnjs32.lib
+# libnsc32.lib 		# libreg32.lib 		# mm3240.lib
+# mnpref32.lib 		# netcst32.lib 		# nsdlg32.lib
+# nsldap32.lib 		# nsldaps32.lib 	# nsn32.lib
+# pkcs1232.lib 		# pkcs732.lib 		# pr3240.lib
+# prefui32.lib 		# prefuuid.lib 		# secmod32.lib
+# secnav32.lib 		# secutl32.lib 		# softup32.lib
+# sp3240.lib 		# ssl32.lib 		# uni3200.lib
+# unicvt32.lib 		# win32md.lib 		# winfont.lib
+# xppref32.lib 		# zlib32.lib
+
+include <$(DEPTH)\config\rules.mak>
+
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+# ALLXPSTR.obj  XP_ALLOC.obj  XP_HASH.obj   XP_RGB.obj    XP_WRAP.obj
+# CXPRINT.obj   XP_C.cl       XP_LIST.obj   XP_SEC.obj    netscape.exp
+# CXPRNDLG.obj  XP_CNTXT.obj  XP_MD5.obj    XP_STR.obj    xp.pch
+# EXPORT.obj    XP_CORE.obj   XP_MESG.obj   XP_THRMO.obj  xppref32.dll
+# XPASSERT.obj  XP_ERROR.obj  XP_RECT.obj   XP_TIME.obj
+# XPLOCALE.obj  XP_FILE.obj   XP_REG.obj    XP_TRACE.obj
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/selfserv/makefile.win b/security/nss/cmd/selfserv/makefile.win
index c979ba915..8fda0b906 100644
--- a/security/nss/cmd/selfserv/makefile.win
+++ b/security/nss/cmd/selfserv/makefile.win
@@ -1,136 +1,136 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = selfserv

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-IGNORE_ME2 = \

- $(WINFE)/feutil.obj \

- $(WINFE)/fenet.obj \

- $(WINFE)/fegui.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- $(SEC_LIBS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = selfserv
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+IGNORE_ME2 = \
+ $(WINFE)/feutil.obj \
+ $(WINFE)/fenet.obj \
+ $(WINFE)/fegui.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ $(SEC_LIBS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/tstclnt/makefile.win b/security/nss/cmd/tstclnt/makefile.win
index c6398ad6d..6cf6c12cf 100644
--- a/security/nss/cmd/tstclnt/makefile.win
+++ b/security/nss/cmd/tstclnt/makefile.win
@@ -1,130 +1,130 @@
-# 

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-VERBOSE	= 1

-include <manifest.mn>

-

-#cannot define PROGRAM in manifest compatibly with NT and UNIX

-PROGRAM = tstclnt

-PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe

-include <$(DEPTH)\config\config.mak>

-

-# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/

-# rules.mak will append C_OBJS onto OBJS.

-# OBJS	= $(CSRCS:.c=.obj)

-

-# include files are looked for in $LINCS and $INCS.

-# $LINCS is in manifest.mnw, computed from REQUIRES=

-INCS = $(INCS) \

- -I$(DEPTH)/security/lib/cert \

- -I../include \

- $(NULL)

-

-IGNORE_ME = \

- -I$(DEPTH)/security/lib/key \

- -I$(DEPTH)/security/lib/util  \

- $(NULL)

-

-

-WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg

-

-# these files are the content of libdbm

-DBM_LIB	= \

- $(WINFE)/DB.obj \

- $(WINFE)/HASH.obj \

- $(WINFE)/H_BIGKEY.obj \

- $(WINFE)/H_PAGE.obj \

- $(WINFE)/H_LOG2.obj \

- $(WINFE)/H_FUNC.obj \

- $(WINFE)/HASH_BUF.obj \

- $(NULL)

-

-MOZ_LIBS = \

- $(WINFE)/ALLXPSTR.obj \

- $(WINFE)/XP_ERROR.obj \

- $(WINFE)/XPASSERT.obj \

- $(WINFE)/XP_REG.obj \

- $(WINFE)/XP_TRACE.obj \

- $(DBM_LIB) \

- $(WINFE)/XP_STR.obj \

- $(WINFE)/MKTEMP.obj \

- $(NULL)

-

-SEC_LIBS = \

- $(DIST)/lib/cert$(MOZ_BITS).lib \

- $(DIST)/lib/crypto$(MOZ_BITS).lib \

- $(DIST)/lib/hash$(MOZ_BITS).lib \

- $(DIST)/lib/key$(MOZ_BITS).lib \

- $(DIST)/lib/pkcs7$(MOZ_BITS).lib \

- $(DIST)/lib/secmod$(MOZ_BITS).lib \

- $(DIST)/lib/secutl$(MOZ_BITS).lib \

- $(DIST)/lib/ssl$(MOZ_BITS).lib \

- $(NULL)

-

-LLFLAGS	= $(LLFLAGS) \

- ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \

- $(SEC_LIBS) \

- $(MOZ_LIBS) \

- $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \

- $(LIBNSPR) \

- $(NULL)

-

-

-include <$(DEPTH)\config\rules.mak>

-

-INSTALL	= $(MAKE_INSTALL)

-

-objs:	$(OBJS)

-

-$(PROGRAM)::

-	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)

-

-programs: $(PROGRAM)

-

-install:: $(TARGETS)

-	$(INSTALL) $(TARGETS) $(DIST)/bin

-

-

-symbols:

-	@echo "CSRCS	= $(CSRCS)"

-	@echo "INCS	= $(INCS)"

-	@echo "OBJS	= $(OBJS)"

-	@echo "LIBRARY	= $(LIBRARY)"

-	@echo "PROGRAM	= $(PROGRAM)"

-	@echo "TARGETS	= $(TARGETS)"

-	@echo "DIST	= $(DIST)"

-	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"

-	@echo "WINFE	= $(WINFE)"

-	@echo "DBM_LIB	= $(DBM_LIB)"

-	@echo "INSTALL	= $(INSTALL)"

-

+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+VERBOSE	= 1
+include <manifest.mn>
+
+#cannot define PROGRAM in manifest compatibly with NT and UNIX
+PROGRAM = tstclnt
+PROGRAM	= ./$(OBJDIR)/$(PROGRAM).exe
+include <$(DEPTH)\config\config.mak>
+
+# let manifest generate C_OBJS, it will prepend ./$(OBJDIR)/
+# rules.mak will append C_OBJS onto OBJS.
+# OBJS	= $(CSRCS:.c=.obj)
+
+# include files are looked for in $LINCS and $INCS.
+# $LINCS is in manifest.mnw, computed from REQUIRES=
+INCS = $(INCS) \
+ -I$(DEPTH)/security/lib/cert \
+ -I../include \
+ $(NULL)
+
+IGNORE_ME = \
+ -I$(DEPTH)/security/lib/key \
+ -I$(DEPTH)/security/lib/util  \
+ $(NULL)
+
+
+WINFE	= $(DEPTH)/cmd/winfe/mkfiles$(MOZ_BITS)/x86Dbg
+
+# these files are the content of libdbm
+DBM_LIB	= \
+ $(WINFE)/DB.obj \
+ $(WINFE)/HASH.obj \
+ $(WINFE)/H_BIGKEY.obj \
+ $(WINFE)/H_PAGE.obj \
+ $(WINFE)/H_LOG2.obj \
+ $(WINFE)/H_FUNC.obj \
+ $(WINFE)/HASH_BUF.obj \
+ $(NULL)
+
+MOZ_LIBS = \
+ $(WINFE)/ALLXPSTR.obj \
+ $(WINFE)/XP_ERROR.obj \
+ $(WINFE)/XPASSERT.obj \
+ $(WINFE)/XP_REG.obj \
+ $(WINFE)/XP_TRACE.obj \
+ $(DBM_LIB) \
+ $(WINFE)/XP_STR.obj \
+ $(WINFE)/MKTEMP.obj \
+ $(NULL)
+
+SEC_LIBS = \
+ $(DIST)/lib/cert$(MOZ_BITS).lib \
+ $(DIST)/lib/crypto$(MOZ_BITS).lib \
+ $(DIST)/lib/hash$(MOZ_BITS).lib \
+ $(DIST)/lib/key$(MOZ_BITS).lib \
+ $(DIST)/lib/pkcs7$(MOZ_BITS).lib \
+ $(DIST)/lib/secmod$(MOZ_BITS).lib \
+ $(DIST)/lib/secutl$(MOZ_BITS).lib \
+ $(DIST)/lib/ssl$(MOZ_BITS).lib \
+ $(NULL)
+
+LLFLAGS	= $(LLFLAGS) \
+ ../lib/$(OBJDIR)/sectool$(MOZ_BITS).lib \
+ $(SEC_LIBS) \
+ $(MOZ_LIBS) \
+ $(DEPTH)/nspr/src/$(OBJDIR)/getopt.obj \
+ $(LIBNSPR) \
+ $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+
+INSTALL	= $(MAKE_INSTALL)
+
+objs:	$(OBJS)
+
+$(PROGRAM)::
+	$(INSTALL) $(DIST)/bin/pr3240.dll ./$(OBJDIR)
+
+programs: $(PROGRAM)
+
+install:: $(TARGETS)
+	$(INSTALL) $(TARGETS) $(DIST)/bin
+
+
+symbols:
+	@echo "CSRCS	= $(CSRCS)"
+	@echo "INCS	= $(INCS)"
+	@echo "OBJS	= $(OBJS)"
+	@echo "LIBRARY	= $(LIBRARY)"
+	@echo "PROGRAM	= $(PROGRAM)"
+	@echo "TARGETS	= $(TARGETS)"
+	@echo "DIST	= $(DIST)"
+	@echo "VERSION_NUMBER	= $(VERSION_NUMBER)"
+	@echo "WINFE	= $(WINFE)"
+	@echo "DBM_LIB	= $(DBM_LIB)"
+	@echo "INSTALL	= $(INSTALL)"
+
diff --git a/security/nss/cmd/zlib/makefile.win b/security/nss/cmd/zlib/makefile.win
index aa6cba7fb..0f87b40b8 100644
--- a/security/nss/cmd/zlib/makefile.win
+++ b/security/nss/cmd/zlib/makefile.win
@@ -1,91 +1,91 @@
-NODEPEND=1

-IGNORE_MANIFEST = 1

-

-#//------------------------------------------------------------------------

-#//

-# New build system where zip dll is build indepenant of java stubs.

-#//

-#//------------------------------------------------------------------------

-MODULE = zlib

-EXPORTS = 				\

-	zlib.h				\

-	zconf.h				\

-	$(NULL)

-

-

-#//------------------------------------------------------------------------

-#//

-#// Specify the depth of the current directory relative to the

-#// root of NS

-#//

-#//------------------------------------------------------------------------

-DEPTH= ..\..\..\

-

-MAKE_OBJ_TYPE=DLL

-#//------------------------------------------------------------------------

-#//

-#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)

-#//

-#//------------------------------------------------------------------------

-DLLNAME=$(ZIPDLL)

-PDBFILE=$(MOD_ZIP).pdb

-MAPFILE=$(MOD_ZIP).map

-!if "$(MOZ_BITS)" == "16"

-DEFFILE=zip16.def

-!endif

-#RESFILE=zip.res

-

-#//------------------------------------------------------------------------

-#// 

-#// Define the files necessary to build the target (ie. OBJS)

-#//

-#//------------------------------------------------------------------------

-OBJS=                                   \

-		  .\$(OBJDIR)\adler32.obj      \

-		  .\$(OBJDIR)\compress.obj     \

-		  .\$(OBJDIR)\crc32.obj        \

-		  .\$(OBJDIR)\deflate.obj      \

-		  .\$(OBJDIR)\gzio.obj         \

-		  .\$(OBJDIR)\infblock.obj     \

-		  .\$(OBJDIR)\infcodes.obj     \

-		  .\$(OBJDIR)\inffast.obj      \

-		  .\$(OBJDIR)\inflate.obj      \

-		  .\$(OBJDIR)\inftrees.obj     \

-		  .\$(OBJDIR)\infutil.obj      \

-		  .\$(OBJDIR)\trees.obj        \

-		  .\$(OBJDIR)\uncompr.obj      \

-		  .\$(OBJDIR)\zutil.obj        \

-		  $(NULL)

-

-#//------------------------------------------------------------------------

-#//

-#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)

-#// (these must be defined before the common makefiles are included)

-#//

-#//------------------------------------------------------------------------

-

-DLL=.\$(OBJDIR)\$(DLLNAME)

-MAPFILE= $(MOD_ZIP).map

-

-

-#//------------------------------------------------------------------------

-#//

-#// Define any local options for the make tools 

-#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)

-#//

-#//------------------------------------------------------------------------

-LLIBS=$(LLIBS)  $(LIBNSPR) 

-LINCS=$(LINCS) -I. -I_gen

-# clobber and clobber_all will remove the following garbage:

-GARBAGE	= $(GARBAGE) _gen

-

-#//------------------------------------------------------------------------

-#//

-#// Include the common makefile rules

-#//

-#//------------------------------------------------------------------------

-include <$(DEPTH)/sun-java/config/rules.mak>

-

-export:: $(DLL)

-    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin

-    $(MAKE_INSTALL) .\$(OBJDIR)\$(MOD_ZIP).lib $(DIST)\lib

+NODEPEND=1
+IGNORE_MANIFEST = 1
+
+#//------------------------------------------------------------------------
+#//
+# New build system where zip dll is build indepenant of java stubs.
+#//
+#//------------------------------------------------------------------------
+MODULE = zlib
+EXPORTS = 				\
+	zlib.h				\
+	zconf.h				\
+	$(NULL)
+
+
+#//------------------------------------------------------------------------
+#//
+#// Specify the depth of the current directory relative to the
+#// root of NS
+#//
+#//------------------------------------------------------------------------
+DEPTH= ..\..\..\
+
+MAKE_OBJ_TYPE=DLL
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
+#//
+#//------------------------------------------------------------------------
+DLLNAME=$(ZIPDLL)
+PDBFILE=$(MOD_ZIP).pdb
+MAPFILE=$(MOD_ZIP).map
+!if "$(MOZ_BITS)" == "16"
+DEFFILE=zip16.def
+!endif
+#RESFILE=zip.res
+
+#//------------------------------------------------------------------------
+#// 
+#// Define the files necessary to build the target (ie. OBJS)
+#//
+#//------------------------------------------------------------------------
+OBJS=                                   \
+		  .\$(OBJDIR)\adler32.obj      \
+		  .\$(OBJDIR)\compress.obj     \
+		  .\$(OBJDIR)\crc32.obj        \
+		  .\$(OBJDIR)\deflate.obj      \
+		  .\$(OBJDIR)\gzio.obj         \
+		  .\$(OBJDIR)\infblock.obj     \
+		  .\$(OBJDIR)\infcodes.obj     \
+		  .\$(OBJDIR)\inffast.obj      \
+		  .\$(OBJDIR)\inflate.obj      \
+		  .\$(OBJDIR)\inftrees.obj     \
+		  .\$(OBJDIR)\infutil.obj      \
+		  .\$(OBJDIR)\trees.obj        \
+		  .\$(OBJDIR)\uncompr.obj      \
+		  .\$(OBJDIR)\zutil.obj        \
+		  $(NULL)
+
+#//------------------------------------------------------------------------
+#//
+#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
+#// (these must be defined before the common makefiles are included)
+#//
+#//------------------------------------------------------------------------
+
+DLL=.\$(OBJDIR)\$(DLLNAME)
+MAPFILE= $(MOD_ZIP).map
+
+
+#//------------------------------------------------------------------------
+#//
+#// Define any local options for the make tools 
+#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
+#//
+#//------------------------------------------------------------------------
+LLIBS=$(LLIBS)  $(LIBNSPR) 
+LINCS=$(LINCS) -I. -I_gen
+# clobber and clobber_all will remove the following garbage:
+GARBAGE	= $(GARBAGE) _gen
+
+#//------------------------------------------------------------------------
+#//
+#// Include the common makefile rules
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/sun-java/config/rules.mak>
+
+export:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MOD_ZIP).lib $(DIST)\lib
diff --git a/security/nss/makefile.win b/security/nss/makefile.win
index 49f667637..4710e1089 100644
--- a/security/nss/makefile.win
+++ b/security/nss/makefile.win
@@ -1,99 +1,99 @@
-#

-# The contents of this file are subject to the Mozilla Public

-# License Version 1.1 (the "License"); you may not use this file

-# except in compliance with the License. You may obtain a copy of

-# the License at http://www.mozilla.org/MPL/

-# 

-# Software distributed under the License is distributed on an "AS

-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or

-# implied. See the License for the specific language governing

-# rights and limitations under the License.

-# 

-# The Original Code is the Netscape security libraries.

-# 

-# The Initial Developer of the Original Code is Netscape

-# Communications Corporation.  Portions created by Netscape are 

-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All

-# Rights Reserved.

-# 

-# Contributor(s):

-# 

-# Alternatively, the contents of this file may be used under the

-# terms of the GNU General Public License Version 2 or later (the

-# "GPL"), in which case the provisions of the GPL are applicable 

-# instead of those above.  If you wish to allow use of your 

-# version of this file only under the terms of the GPL and not to

-# allow others to use your version of this file under the MPL,

-# indicate your decision by deleting the provisions above and

-# replace them with the notice and other provisions required by

-# the GPL.  If you do not delete the provisions above, a recipient

-# may use your version of this file under either the MPL or the

-# GPL.

-#

-

-#

-# An NMAKE file to set up and adjust NSS's build system for

-# Client build.  Client build should invoke NMAKE on this file

-# instead of invoking gmake directly.

-#

-

-DEPTH = ..\..

-include <$(DEPTH)\config\config.mak>

-

-GMAKE = gmake.exe

-

-GMAKE_FLAGS = OBJDIR_NAME=$(OBJDIR) MOZILLA_CLIENT=1

-GMAKE_FLAGS = $(GMAKE_FLAGS) SOURCE_MDHEADERS_DIR=$(MOZ_SRC:\=/)/mozilla/dist/include/nspr

-

-#

-# The Client's debug build uses MSVC's debug runtime library (/MDd).

-#

-

-!ifndef MOZ_DEBUG

-GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1

-!endif

-

-!if "$(MOZ_BITS)" == "16"

-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16

-!else

-

-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95

-!ifdef MOZ_DEBUG

-!ifndef MOZ_NO_DEBUG_RTL

-GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1

-!endif

-!endif

-

-!endif

- 

-#

-# The rules.  Simply invoke gmake with the same target.

-# The default target is 'all'.  For Win16, set up the

-# environment to use the Watcom compiler, Watcom headers,

-# and Watcom libs.

-#

-

-all:: export libs install

-

-install:: moz_import install_roots

-

-depend::

-

-export libs install clobber clobber_all clean::

-!if "$(MOZ_BITS)" == "16"

-	set PATH=%WATCPATH%

-	set INCLUDE=%WATC_INC%

-	set LIB=%WATC_LIB%

-!endif

-	$(GMAKE) -C lib $(GMAKE_FLAGS) $@

-!if "$(MOZ_BITS)" == "16"

-	set PATH=%MSVCPATH%

-	set INCLUDE=%MSVC_INC%

-	set LIB=%MSVC_LIB%

-!endif

-

-moz_import::

-	copy $(DIST)\lib\dbm32.lib $(DIST)\lib\dbm.lib

-

-install_roots::

-	$(MAKE_INSTALL) $(DIST)\lib\nssckbi.dll $(DIST)\bin

+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+#
+# An NMAKE file to set up and adjust NSS's build system for
+# Client build.  Client build should invoke NMAKE on this file
+# instead of invoking gmake directly.
+#
+
+DEPTH = ..\..
+include <$(DEPTH)\config\config.mak>
+
+GMAKE = gmake.exe
+
+GMAKE_FLAGS = OBJDIR_NAME=$(OBJDIR) MOZILLA_CLIENT=1
+GMAKE_FLAGS = $(GMAKE_FLAGS) SOURCE_MDHEADERS_DIR=$(MOZ_SRC:\=/)/mozilla/dist/include/nspr
+
+#
+# The Client's debug build uses MSVC's debug runtime library (/MDd).
+#
+
+!ifndef MOZ_DEBUG
+GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1
+!endif
+
+!if "$(MOZ_BITS)" == "16"
+GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16
+!else
+
+GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95
+!ifdef MOZ_DEBUG
+!ifndef MOZ_NO_DEBUG_RTL
+GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1
+!endif
+!endif
+
+!endif
+ 
+#
+# The rules.  Simply invoke gmake with the same target.
+# The default target is 'all'.  For Win16, set up the
+# environment to use the Watcom compiler, Watcom headers,
+# and Watcom libs.
+#
+
+all:: export libs install
+
+install:: moz_import install_roots
+
+depend::
+
+export libs install clobber clobber_all clean::
+!if "$(MOZ_BITS)" == "16"
+	set PATH=%WATCPATH%
+	set INCLUDE=%WATC_INC%
+	set LIB=%WATC_LIB%
+!endif
+	$(GMAKE) -C lib $(GMAKE_FLAGS) $@
+!if "$(MOZ_BITS)" == "16"
+	set PATH=%MSVCPATH%
+	set INCLUDE=%MSVC_INC%
+	set LIB=%MSVC_LIB%
+!endif
+
+moz_import::
+	copy $(DIST)\lib\dbm32.lib $(DIST)\lib\dbm.lib
+
+install_roots::
+	$(MAKE_INSTALL) $(DIST)\lib\nssckbi.dll $(DIST)\bin