diff --git a/base/src/makefile.win b/base/src/makefile.win index 924600079e7..68eb9379c2d 100644 --- a/base/src/makefile.win +++ b/base/src/makefile.win @@ -98,7 +98,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/base/tests/makefile.win b/base/tests/makefile.win index 9f50f77ad12..084aedbd064 100644 --- a/base/tests/makefile.win +++ b/base/tests/makefile.win @@ -45,7 +45,7 @@ LLIBS= \ $(DIST)\lib\netlib.lib \ !endif $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ !endif diff --git a/caps/src/makefile.win b/caps/src/makefile.win index 4c160e70545..ce73726eb3d 100755 --- a/caps/src/makefile.win +++ b/caps/src/makefile.win @@ -107,7 +107,7 @@ LINCS= $(LINCS) \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\zip3250.lib \ diff --git a/client.mk b/client.mk index 3e95b728556..c55d5027d18 100644 --- a/client.mk +++ b/client.mk @@ -153,7 +153,7 @@ ifdef MOZ_WITH_NSPR NSPR_INSTALL_DIR := $(MOZ_WITH_NSPR) NEED_WITH_NSPR := 1 else -ifneq ("$(wildcard /usr/lib/libnspr21*)","") +ifneq ("$(wildcard /usr/lib/libnspr3*)","") NSPR_INSTALL_DIR := /usr else NSPR_INSTALL_DIR := $(OBJDIR)/nspr @@ -300,10 +300,10 @@ build: nspr $(OBJDIR)/Makefile # Build & install nspr. Classic build, no autoconf. # Linux/RPM available. -nspr: $(NSPR_INSTALL_DIR)/lib/libnspr21.so +nspr: $(NSPR_INSTALL_DIR)/lib/libnspr3.so @echo NSPR is installed in $(NSPR_INSTALL_DIR)/lib objdir=$(OBJDIR) -$(NSPR_INSTALL_DIR)/lib/libnspr21.so: +$(NSPR_INSTALL_DIR)/lib/libnspr3.so: @-$(MKDIR) -p $(NSPR_INSTALL_DIR) ($(MAKE) -C $(TOPSRCDIR)/nsprpub $(NSPR_GMAKE_OPTIONS)) diff --git a/config/config.mak b/config/config.mak index 1417b78eca9..670fd89c472 100644 --- a/config/config.mak +++ b/config/config.mak @@ -311,11 +311,11 @@ MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat #// #//------------------------------------------------------------------------ !if "$(MOZ_BITS)" == "16" -LIBNSPR=$(DIST)\lib\nspr21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib +LIBNSPR=$(DIST)\lib\nspr3.lib +LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib !else -LIBNSPR=$(DIST)\lib\libnspr21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib +LIBNSPR=$(DIST)\lib\nspr3.lib +LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib !endif NSPRDIR = nsprpub diff --git a/config/config.mk b/config/config.mk index c97a54af05d..26376c23e35 100644 --- a/config/config.mk +++ b/config/config.mk @@ -332,8 +332,8 @@ LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX) LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX) NSPRDIR = nsprpub -LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX) -PURELIBNSPR = $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX) +LIBNSPR = $(DIST)/lib/libplds3.$(LIB_SUFFIX) $(DIST)/lib/libnspr3.$(LIB_SUFFIX) +PURELIBNSPR = $(DIST)/lib/purelibplds3.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr3.$(LIB_SUFFIX) ifdef DBMALLOC LIBNSPR += $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX) diff --git a/configure b/configure index 9cdcc1dfeaa..8681eb2dfe2 100755 --- a/configure +++ b/configure @@ -7883,9 +7883,9 @@ else LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS" fi -echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21"""... $ac_c" 1>&6 -echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr21"" >&5 -LIBS="-lnspr21 $NSPR_LIBS $LIBS" +echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6 +echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr3"" >&5 +LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then _NSPR_NEEDS_THREAD_LIB=1 result="no" else @@ -7902,7 +7902,7 @@ else EOF if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" + NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -8003,11 +8003,11 @@ fi ;; esac -echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21 with thread lib"""... $ac_c" 1>&6 -echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5 - LIBS="-lnspr21 $NSPR_LIBS $LIBS" +echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6 +echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5 + LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then - MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no" + MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" + NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no" + MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no" fi rm -fr conftest* fi @@ -8037,14 +8037,14 @@ echo "$ac_t"""$result"" 1>&6 fi -echo $ac_n "checking for PL_CreateOptState in -lplc21""... $ac_c" 1>&6 -echo "configure:8042: checking for PL_CreateOptState in -lplc21" >&5 -ac_lib_var=`echo plc21'_'PL_CreateOptState | sed 'y%./+-%__p_%'` +echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6 +echo "configure:8042: checking for PL_CreateOptState in -lplc3" >&5 +ac_lib_var=`echo plc3'_'PL_CreateOptState | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lplc21 $NSPR_LIBS $LIBS" +LIBS="-lplc3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&6 - NSPR_LIBS="-lplc21 $NSPR_LIBS" + NSPR_LIBS="-lplc3 $NSPR_LIBS" else echo "$ac_t""no" 1>&6 -MISSING_NSPR="$MISSING_NSPR -lplc21" +MISSING_NSPR="$MISSING_NSPR -lplc3" fi -echo $ac_n "checking for PL_GetEvent in -lplds21""... $ac_c" 1>&6 -echo "configure:8083: checking for PL_GetEvent in -lplds21" >&5 -ac_lib_var=`echo plds21'_'PL_GetEvent | sed 'y%./+-%__p_%'` +echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6 +echo "configure:8083: checking for PL_GetEvent in -lplds3" >&5 +ac_lib_var=`echo plds3'_'PL_GetEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lplds21 $NSPR_LIBS $LIBS" +LIBS="-lplds3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&6 - NSPR_LIBS="-lplds21 $NSPR_LIBS" + NSPR_LIBS="-lplds3 $NSPR_LIBS" else echo "$ac_t""no" 1>&6 -MISSING_NSPR="$MISSING_NSPR -lplds21" +MISSING_NSPR="$MISSING_NSPR -lplds3" fi diff --git a/configure.in b/configure.in index c8897110c03..551aec4bd63 100644 --- a/configure.in +++ b/configure.in @@ -1300,8 +1300,8 @@ else LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS" fi -AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21") -LIBS="-lnspr21 $NSPR_LIBS $LIBS" +AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3") +LIBS="-lnspr3 $NSPR_LIBS $LIBS" AC_TRY_RUN( #include #include @@ -1309,7 +1309,7 @@ AC_TRY_RUN( PRThread *dummy = PR_GetCurrentThread(); exit(0); } - , [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"], + , [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"], [_NSPR_NEEDS_THREAD_LIB=1 result="no"], [_NSPR_NEEDS_THREAD_LIB=1 result="no"] ) rm -f core @@ -1328,8 +1328,8 @@ case "$target" in NSPR_LIBS="-lpthread $NSPR_LIBS") ;; esac -AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib") - LIBS="-lnspr21 $NSPR_LIBS $LIBS" +AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3 with thread lib") + LIBS="-lnspr3 $NSPR_LIBS $LIBS" AC_TRY_RUN( #include #include @@ -1337,20 +1337,20 @@ AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib") PRThread *dummy = PR_GetCurrentThread(); exit(0); } - , [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"], - [MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"], - [MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"] ) + , [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"], + [MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"], + [MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"] ) rm -f core AC_MSG_RESULT("$result") fi -dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS", -dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS) +dnl AC_CHECK_LIB(nspr3, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS", +dnl [MISSING_NSPR="$MISSING_NSPR -lnspr3"], $NSPR_LIBS) -AC_CHECK_LIB(plc21, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS", - [MISSING_NSPR="$MISSING_NSPR -lplc21"], $NSPR_LIBS) -AC_CHECK_LIB(plds21, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS", - [MISSING_NSPR="$MISSING_NSPR -lplds21"], $NSPR_LIBS) +AC_CHECK_LIB(plc3, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS", + [MISSING_NSPR="$MISSING_NSPR -lplc3"], $NSPR_LIBS) +AC_CHECK_LIB(plds3, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS", + [MISSING_NSPR="$MISSING_NSPR -lplds3"], $NSPR_LIBS) CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS diff --git a/dom/src/build/makefile.win b/dom/src/build/makefile.win index dbf3563c401..297130182e2 100644 --- a/dom/src/build/makefile.win +++ b/dom/src/build/makefile.win @@ -51,8 +51,8 @@ MISCDEP = \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplds21.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plds3.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) LCFLAGS = \ @@ -73,8 +73,8 @@ LLIBS= \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplds21.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plds3.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/editor/base/makefile.win b/editor/base/makefile.win index 14fb865ae4f..305a4f4e3d9 100644 --- a/editor/base/makefile.win +++ b/editor/base/makefile.win @@ -114,7 +114,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\raptorwidget_s.lib \ diff --git a/extensions/wallet/module/makefile.win b/extensions/wallet/module/makefile.win index 08acc6011b9..e69de29bb2d 100644 --- a/extensions/wallet/module/makefile.win +++ b/extensions/wallet/module/makefile.win @@ -1,103 +0,0 @@ -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. - - -#//------------------------------------------------------------------------ -#// -# New build system where zip dll is build indepenant of java stubs. -#// -#//------------------------------------------------------------------------ -MODULE = walletlib -EXPORTS = nsIWalletService.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=walletlib - -#//------------------------------------------------------------------------ -#// -#// Define the files necessary to build the target (ie. OBJS) -#// -#//------------------------------------------------------------------------ -OBJS= \ - .\$(OBJDIR)\nsWalletService.obj \ - .\$(OBJDIR)\nsWalletFactory.obj \ - $(NULL) - -#//------------------------------------------------------------------------ -#// -#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...) -#// (these must be defined before the common makefiles are included) -#// -#//------------------------------------------------------------------------ - -DLL=.\$(OBJDIR)\$(DLLNAME).dll - -#//------------------------------------------------------------------------ -#// -#// Define any local options for the make tools -#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS) -#// -#//------------------------------------------------------------------------ -LCFLAGS=-DNETSCAPE -D_IMPL_NS_NET -DNO_NETWORK_POLLING - -WALLETLIBS=\ - $(DIST)\lib\wallet.lib \ - $(NULL) - -LLIBS=$(LLIBS) $(LIBNSPR) \ - $(WALLETLIBS) \ - $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\secfreenav32.lib \ - $(DIST)\lib\libplc21.lib \ - $(DIST)\lib\xppref32.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\xplib.lib \ - $(DIST)\lib\netlib.lib \ - $(NULL) - -LINCS=$(LINCS) -I. \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\wallet \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\netlib \ - $(NULL) - - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include <$(DEPTH)/config/rules.mak> - -$(DLL): $(WALLETLIBS) - -libs:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\walletlib.lib $(DIST)\lib diff --git a/gfx/src/windows/makefile.win b/gfx/src/windows/makefile.win index fe5e3635ba7..c86f6bc3b27 100644 --- a/gfx/src/windows/makefile.win +++ b/gfx/src/windows/makefile.win @@ -76,7 +76,7 @@ LLIBS= \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\raptorgfx_s.lib \ !if defined(NGLAYOUT_DDRAW) diff --git a/gfx/tests/btest/makefile.win b/gfx/tests/btest/makefile.win index 22622b2303a..6aee7792764 100644 --- a/gfx/tests/btest/makefile.win +++ b/gfx/tests/btest/makefile.win @@ -29,7 +29,7 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ comdlg32.lib \ diff --git a/gfx/tests/makefile.win b/gfx/tests/makefile.win index 44a1b06a143..ec793cd7d11 100644 --- a/gfx/tests/makefile.win +++ b/gfx/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/htmlparser/robot/makefile.win b/htmlparser/robot/makefile.win index 80ad280d2ae..801647fab59 100644 --- a/htmlparser/robot/makefile.win +++ b/htmlparser/robot/makefile.win @@ -26,7 +26,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(NULL) diff --git a/htmlparser/src/makefile.win b/htmlparser/src/makefile.win index fb7e082c478..a7689781d56 100644 --- a/htmlparser/src/makefile.win +++ b/htmlparser/src/makefile.win @@ -135,7 +135,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ $(LIBNSPR) diff --git a/intl/locale/src/windows/makefile.win b/intl/locale/src/windows/makefile.win index 929ebec2165..6c0e7dfc6ed 100644 --- a/intl/locale/src/windows/makefile.win +++ b/intl/locale/src/windows/makefile.win @@ -55,7 +55,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nslocale_s.lib \ $(LIBNSPR) diff --git a/intl/locale/tests/makefile.win b/intl/locale/tests/makefile.win index 43c5673913f..05cd2c959d9 100644 --- a/intl/locale/tests/makefile.win +++ b/intl/locale/tests/makefile.win @@ -35,7 +35,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nslocale.lib LLFLAGS= /NODEFAULTLIB msvcirt.lib msvcrt.lib diff --git a/intl/lwbrk/src/makefile.win b/intl/lwbrk/src/makefile.win index e01c24892ab..4a958ab6502 100644 --- a/intl/lwbrk/src/makefile.win +++ b/intl/lwbrk/src/makefile.win @@ -55,7 +55,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(LIBNSPR) diff --git a/intl/lwbrk/tests/makefile.win b/intl/lwbrk/tests/makefile.win index 112a316f3e2..df2cb6fab7e 100644 --- a/intl/lwbrk/tests/makefile.win +++ b/intl/lwbrk/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/intl/strres/src/makefile.win b/intl/strres/src/makefile.win index 68dd8daae62..300d3dc7b65 100644 --- a/intl/strres/src/makefile.win +++ b/intl/strres/src/makefile.win @@ -53,7 +53,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/intl/strres/tests/makefile.win b/intl/strres/tests/makefile.win index 3faad83c553..6ffb3fa52f8 100644 --- a/intl/strres/tests/makefile.win +++ b/intl/strres/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ !endif diff --git a/intl/unicharutil/src/makefile.win b/intl/unicharutil/src/makefile.win index ef4d4e38272..ab9842eb253 100644 --- a/intl/unicharutil/src/makefile.win +++ b/intl/unicharutil/src/makefile.win @@ -53,7 +53,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/intl/unicharutil/tests/makefile.win b/intl/unicharutil/tests/makefile.win index 40441a52b78..7a6a65939f3 100644 --- a/intl/unicharutil/tests/makefile.win +++ b/intl/unicharutil/tests/makefile.win @@ -32,7 +32,7 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/jpeg/jpg1640.def b/jpeg/jpg1640.def index 1acd52cbf08..95a2f168386 100644 --- a/jpeg/jpg1640.def +++ b/jpeg/jpg1640.def @@ -40,10 +40,10 @@ EXPORTS _jpeg_close_file = _jpeg_close_file @25 IMPORTS - _malloc = nspr21.2 - _realloc = nspr21.3 - _calloc = nspr21.4 - _free = nspr21.5 - _getenv = nspr21.9 - _printf = nspr21.11 - _sscanf = nspr21.33 + _malloc = nspr3.2 + _realloc = nspr3.3 + _calloc = nspr3.4 + _free = nspr3.5 + _getenv = nspr3.9 + _printf = nspr3.11 + _sscanf = nspr3.33 diff --git a/js/src/Makefile.ref b/js/src/Makefile.ref index d804fc5abfb..b2bf55ba0a6 100644 --- a/js/src/Makefile.ref +++ b/js/src/Makefile.ref @@ -34,9 +34,9 @@ ifdef JS_THREADSAFE DEFINES += -DJS_THREADSAFE INCLUDES += -I../../dist/$(OBJDIR)/include ifdef USE_MSVC -OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr21.lib +OTHER_LIBS += ../../dist/$(OBJDIR)/lib/nspr3.lib else -OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr21 +OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr3 endif endif diff --git a/js/src/jsconfig.mk b/js/src/jsconfig.mk index 8d4fbd8312c..1118635dbd0 100644 --- a/js/src/jsconfig.mk +++ b/js/src/jsconfig.mk @@ -62,9 +62,9 @@ ifdef JS_LIVECONNECT endif ifdef JS_THREADSAFE ifeq ($(OS_ARCH), HP-UX) - SHIP_LIBS += libnspr21.sl + SHIP_LIBS += libnspr3.sl else - SHIP_LIBS += libnspr21.so + SHIP_LIBS += libnspr3.so endif endif ifeq ($(OS_ARCH), WINNT) @@ -73,7 +73,7 @@ ifeq ($(OS_ARCH), WINNT) SHIP_LIBS += jsj.dll endif ifdef JS_THREADSAFE - SHIP_LIBS += libnspr21.dll + SHIP_LIBS += nspr3.dll endif endif SHIP_LIBS := $(addprefix $(SHIP_DIST)/lib/, $(SHIP_LIBS)) diff --git a/js/src/liveconnect/Makefile.ref b/js/src/liveconnect/Makefile.ref index dc8487df279..1d216cbf412 100644 --- a/js/src/liveconnect/Makefile.ref +++ b/js/src/liveconnect/Makefile.ref @@ -77,9 +77,9 @@ endif ifdef JS_THREADSAFE ifdef USE_MSVC -OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr21.lib +OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/nspr3.lib else -OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr21 +OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr3 endif endif diff --git a/js/src/xpcom/xpcom.dsp b/js/src/xpcom/xpcom.dsp index a83ee67a6e5..e69de29bb2d 100644 --- a/js/src/xpcom/xpcom.dsp +++ b/js/src/xpcom/xpcom.dsp @@ -1,141 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xpcom" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=xpcom - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "xpcom.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "xpcom.mak" CFG="xpcom - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xpcom - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "xpcom - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "xpcom - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 - -!ELSEIF "$(CFG)" == "xpcom - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "EXPORT_JS_API" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /D "JS_THREADSAFE" /D "NSPR20" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib H:\trees\ns\dist\WINNT4.0_DBG.OBJ\lib\libnspr21.lib h:\trees\mozilla.org\mozilla\dist\WIN32_D.OBJ\lib\xpcom32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "xpcom - Win32 Release" -# Name "xpcom - Win32 Debug" -# Begin Source File - -SOURCE=.\jsContext.cpp -# End Source File -# Begin Source File - -SOURCE=.\jsContext.h -# End Source File -# Begin Source File - -SOURCE=.\jsIContext.h -# End Source File -# Begin Source File - -SOURCE=.\jsIErrorReporter.h -# End Source File -# Begin Source File - -SOURCE=.\jsIFunction.h -# End Source File -# Begin Source File - -SOURCE=.\jsIRuntime.h -# End Source File -# Begin Source File - -SOURCE=.\jsIScript.h -# End Source File -# Begin Source File - -SOURCE=.\jsIScriptable.cpp -# End Source File -# Begin Source File - -SOURCE=.\jsIScriptable.h -# End Source File -# Begin Source File - -SOURCE=.\jsRuntime.cpp -# End Source File -# Begin Source File - -SOURCE=.\jsRuntime.h -# End Source File -# Begin Source File - -SOURCE=.\JSWrapper.cpp -# End Source File -# Begin Source File - -SOURCE=.\JSWrapper.h -# End Source File -# End Target -# End Project diff --git a/layout/base/tests/makefile.win b/layout/base/tests/makefile.win index e8334b0c378..b134dc4cf37 100644 --- a/layout/base/tests/makefile.win +++ b/layout/base/tests/makefile.win @@ -29,7 +29,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\jsdom.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/layout/build/makefile.win b/layout/build/makefile.win index 301d0be73e2..8987b62e077 100644 --- a/layout/build/makefile.win +++ b/layout/build/makefile.win @@ -52,7 +52,7 @@ MISCDEP = \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\jsdom.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js3250.lib \ $(DIST)\lib\oji.lib \ $(DIST)\lib\jsj3250.lib \ @@ -85,7 +85,7 @@ LLIBS= \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ !if defined(MOZ_DEBUG) && defined(GLOWCODE) && "$(MOZ_BITS)"=="32" $(GLOWDIR)\glowcode.lib \ diff --git a/layout/html/tests/makefile.win b/layout/html/tests/makefile.win index a8a5d3897f2..a80f9066657 100644 --- a/layout/html/tests/makefile.win +++ b/layout/html/tests/makefile.win @@ -60,7 +60,7 @@ LLIBS= \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/build/makefile.win b/mailnews/base/build/makefile.win index fd7416e8f6c..246aeb3a150 100644 --- a/mailnews/base/build/makefile.win +++ b/mailnews/base/build/makefile.win @@ -87,7 +87,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xplib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\appcores.lib \ diff --git a/mailnews/base/tests/Makefile.in b/mailnews/base/tests/Makefile.in index 57abb4dd94d..ff30cae9a11 100644 --- a/mailnews/base/tests/Makefile.in +++ b/mailnews/base/tests/Makefile.in @@ -33,9 +33,9 @@ LIBS = \ -L$(DIST)/bin \ -lxpcom \ -lreg \ - -lnspr21 \ - -lplc21 \ - -lplds21 \ + -lnspr3 \ + -lplc3 \ + -lplds3 \ $(NULL) diff --git a/mailnews/compose/build/makefile.win b/mailnews/compose/build/makefile.win index c784e0ffcf8..9ec17824fda 100644 --- a/mailnews/compose/build/makefile.win +++ b/mailnews/compose/build/makefile.win @@ -84,7 +84,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xplib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\msgcompose.lib \ diff --git a/mailnews/compose/tests/smtp/makefile.win b/mailnews/compose/tests/smtp/makefile.win index fa270143969..527d69bfbd6 100644 --- a/mailnews/compose/tests/smtp/makefile.win +++ b/mailnews/compose/tests/smtp/makefile.win @@ -35,7 +35,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xplib.lib \ $(NULL) diff --git a/mailnews/local/build/makefile.win b/mailnews/local/build/makefile.win index 1b6262a69b1..27f30772501 100644 --- a/mailnews/local/build/makefile.win +++ b/mailnews/local/build/makefile.win @@ -44,7 +44,7 @@ LLIBS=\ $(DIST)\lib\msgdb.lib \ $(DIST)\lib\msglocal.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\rdfutil_s.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mailnews/local/tests/mailbox/makefile.win b/mailnews/local/tests/mailbox/makefile.win index 6ce5bd922f0..3ae156c47c4 100644 --- a/mailnews/local/tests/mailbox/makefile.win +++ b/mailnews/local/tests/mailbox/makefile.win @@ -44,7 +44,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\rdfutil_s.lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\msgdb.lib \ diff --git a/mailnews/local/tests/mboxParser/makefile.win b/mailnews/local/tests/mboxParser/makefile.win index 0218345d3b1..440f79b805a 100644 --- a/mailnews/local/tests/mboxParser/makefile.win +++ b/mailnews/local/tests/mboxParser/makefile.win @@ -42,7 +42,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\msglocal.lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\rdf.lib \ diff --git a/mailnews/local/tests/pop3/makefile.win b/mailnews/local/tests/pop3/makefile.win index d505bc04241..6dbaa539bde 100644 --- a/mailnews/local/tests/pop3/makefile.win +++ b/mailnews/local/tests/pop3/makefile.win @@ -42,7 +42,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\msglocal.lib \ $(DIST)\lib\msgcore.lib \ diff --git a/mailnews/mime/cthandlers/calendar/makefile.win b/mailnews/mime/cthandlers/calendar/makefile.win index d4ab56c20ee..1ca5473c5b5 100644 --- a/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mailnews/mime/cthandlers/calendar/makefile.win @@ -88,7 +88,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\xpcom32.lib \ $(NULL) diff --git a/mailnews/mime/cthandlers/vcard/makefile.win b/mailnews/mime/cthandlers/vcard/makefile.win index 5db21cf2fc3..447c65a8bfb 100644 --- a/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mailnews/mime/cthandlers/vcard/makefile.win @@ -96,7 +96,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\xppref32.lib \ diff --git a/mailnews/mime/src/makefile.win b/mailnews/mime/src/makefile.win index 6e2c9aea5c6..b5aae58371d 100644 --- a/mailnews/mime/src/makefile.win +++ b/mailnews/mime/src/makefile.win @@ -157,7 +157,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\xppref32.lib \ diff --git a/mailnews/news/tests/nntp/makefile.win b/mailnews/news/tests/nntp/makefile.win index 46b8aaf5499..902a7c339ab 100644 --- a/mailnews/news/tests/nntp/makefile.win +++ b/mailnews/news/tests/nntp/makefile.win @@ -35,7 +35,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nntp.lib \ $(DIST)\lib\nntpTest.lib \ $(DIST)\lib\msgcore.lib \ diff --git a/mailnews/ui/messenger/src/makefile.win b/mailnews/ui/messenger/src/makefile.win index 3f3f5fbf64d..40f82f606cd 100644 --- a/mailnews/ui/messenger/src/makefile.win +++ b/mailnews/ui/messenger/src/makefile.win @@ -63,7 +63,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib\ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nntp.lib \ $(DIST)\lib\nntpTest.lib \ $(DIST)\lib\msgCore.lib \ diff --git a/modules/libimg/src/makefile.win b/modules/libimg/src/makefile.win index 2b7fd43c46d..6ae8eb47e2a 100644 --- a/modules/libimg/src/makefile.win +++ b/modules/libimg/src/makefile.win @@ -50,7 +50,7 @@ LCFLAGS = $(LCFLAGS) /TP LLIBS=$(DIST)\lib\png.lib \ $(LIBNSPR) \ $(LIBJPEG) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/modules/libpref/src/makefile.win b/modules/libpref/src/makefile.win index 3fc260dd558..cac9bbcd5fc 100644 --- a/modules/libpref/src/makefile.win +++ b/modules/libpref/src/makefile.win @@ -76,7 +76,7 @@ HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib # DEFFILE = $(DLLNAME).def LLIBS = \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/modules/libpref/src/xppref16.def b/modules/libpref/src/xppref16.def index e0fc7ec5079..659b63195c3 100644 --- a/modules/libpref/src/xppref16.def +++ b/modules/libpref/src/xppref16.def @@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE HEAPSIZE 8192 IMPORTS - _sscanf = nspr21.33 + _sscanf = nspr3.33 EXPORTS _PREF_Init = _PREF_Init diff --git a/modules/libpref/src/xpref16.def b/modules/libpref/src/xpref16.def index e0fc7ec5079..659b63195c3 100644 --- a/modules/libpref/src/xpref16.def +++ b/modules/libpref/src/xpref16.def @@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE HEAPSIZE 8192 IMPORTS - _sscanf = nspr21.33 + _sscanf = nspr3.33 EXPORTS _PREF_Init = _PREF_Init diff --git a/modules/libreg/src/makefile.win b/modules/libreg/src/makefile.win index b67892e12fe..56269c90e1b 100644 --- a/modules/libreg/src/makefile.win +++ b/modules/libreg/src/makefile.win @@ -72,7 +72,7 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ LCFLAGS = $(LCFLAGS) -LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\libplc21.lib +LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/modules/libreg/standalone/makefile.win b/modules/libreg/standalone/makefile.win index e85c5593a1e..9c4f2899c6d 100644 --- a/modules/libreg/standalone/makefile.win +++ b/modules/libreg/standalone/makefile.win @@ -82,13 +82,12 @@ LINCS= $(LINCS) -I$(PUBLIC)/libreg \ #//------------------------------------------------------------------------ include <$(DEPTH)/config/rules.mak> -reg.c:: +reg.c: $(RM) $(DEPTH)\modules\libreg\standalone\reg.h $(RM) $(DEPTH)\modules\libreg\standalone\reg.c $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c - copy $(DEPTH)\modules\libreg\src\reg.h $(DEPTH)\modules\libreg\standalone\reg.h copy $(DEPTH)\modules\libreg\src\reg.c $(DEPTH)\modules\libreg\standalone\reg.c copy $(DEPTH)\modules\libreg\src\vr_stubs.h $(DEPTH)\modules\libreg\standalone\vr_stubs.h @@ -112,4 +111,4 @@ clobber:: $(RM) $(DEPTH)\modules\libreg\standalone\reg.c $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c - $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c \ No newline at end of file + $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c diff --git a/modules/oji/src/makefile.win b/modules/oji/src/makefile.win index 1b5fa0649fd..6b0bdf4ded7 100644 --- a/modules/oji/src/makefile.win +++ b/modules/oji/src/makefile.win @@ -103,7 +103,7 @@ EXPORTS = jvmmgr.h \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\js3250.lib \ diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index baadc115123..9b7927d9761 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/modules/plugin/base/src/Makefile.in @@ -43,7 +43,7 @@ CPPSRCS = \ nsPluginInstancePeer.cpp \ $(NULL) -REQUIRES = raptor plugin java xpcom netlib libplc21 oji +REQUIRES = raptor plugin java xpcom netlib libplc3 oji CFLAGS += -D_IMPL_NS_PLUGIN diff --git a/modules/plugin/base/src/makefile.win b/modules/plugin/base/src/makefile.win index 9411e87a1db..a11176205dc 100644 --- a/modules/plugin/base/src/makefile.win +++ b/modules/plugin/base/src/makefile.win @@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib OURLIBS = \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\$(CACHELIBNAME) \ $(DIST)\lib\xppref32.lib \ diff --git a/modules/plugin/nglsrc/Makefile.in b/modules/plugin/nglsrc/Makefile.in index baadc115123..9b7927d9761 100644 --- a/modules/plugin/nglsrc/Makefile.in +++ b/modules/plugin/nglsrc/Makefile.in @@ -43,7 +43,7 @@ CPPSRCS = \ nsPluginInstancePeer.cpp \ $(NULL) -REQUIRES = raptor plugin java xpcom netlib libplc21 oji +REQUIRES = raptor plugin java xpcom netlib libplc3 oji CFLAGS += -D_IMPL_NS_PLUGIN diff --git a/modules/plugin/nglsrc/makefile.win b/modules/plugin/nglsrc/makefile.win index 9411e87a1db..a11176205dc 100644 --- a/modules/plugin/nglsrc/makefile.win +++ b/modules/plugin/nglsrc/makefile.win @@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib OURLIBS = \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\$(CACHELIBNAME) \ $(DIST)\lib\xppref32.lib \ diff --git a/modules/zlib/src/zip16.def b/modules/zlib/src/zip16.def index 1c228a4558a..e69de29bb2d 100644 --- a/modules/zlib/src/zip16.def +++ b/modules/zlib/src/zip16.def @@ -1,24 +0,0 @@ -LIBRARY zip1640.DLL -EXETYPE WINDOWS -PROTMODE - -DESCRIPTION '16-bit Zip DLL' - -STUB 'WINSTUB.EXE' - -CODE LOADONCALL MOVEABLE DISCARDABLE -DATA PRELOAD MOVEABLE SINGLE - -HEAPSIZE 8192 - -EXPORTS - -IMPORTS - _malloc = nspr21.2 - _realloc = nspr21.3 - _calloc = nspr21.4 - _free = nspr21.5 - _getenv = nspr21.9 - _printf = nspr21.11 - _sscanf = nspr21.33 - diff --git a/network/cache/nu/src/Makefile.in b/network/cache/nu/src/Makefile.in index dc936113a1e..8d40e618df5 100644 --- a/network/cache/nu/src/Makefile.in +++ b/network/cache/nu/src/Makefile.in @@ -29,7 +29,7 @@ LIBRARY_NAME=cache MISCDEP = \ $(NSPR_LIBS) \ $(DIST)/lib/dbm32.lib \ - $(DIST)/lib/libplc21.lib \ + $(DIST)/lib/plc3.lib \ $(DIST)/lib/xpcom32.lib \ $(DIST)/lib/libpref.lib \ $(NULL) @@ -56,7 +56,7 @@ REQUIRES = dbm pref js xpcom LLIBS = \ $(DIST)/lib/dbm32.lib \ - $(DIST)/lib/libplc21.lib \ + $(DIST)/lib/plc3.lib \ $(DIST)/lib/xpcom32.lib \ $(DIST)/lib/libpref.lib \ $(NSPR_LIBS) \ diff --git a/network/cache/nu/src/makefile.win b/network/cache/nu/src/makefile.win index 5a658acdb03..822d9147bf1 100644 --- a/network/cache/nu/src/makefile.win +++ b/network/cache/nu/src/makefile.win @@ -26,11 +26,11 @@ DLLNAME = cache LIBRARY_NAME=cache # -# Remember to change libplc21 to $whatever it is... +# Remember to change libplc3 to $whatever it is... # LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\dbm32.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libpref.lib \ diff --git a/network/cache/nu/tests/cb/cb.mak b/network/cache/nu/tests/cb/cb.mak index fae23dccc57..e69de29bb2d 100644 --- a/network/cache/nu/tests/cb/cb.mak +++ b/network/cache/nu/tests/cb/cb.mak @@ -1,526 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -!IF "$(CFG)" == "" -CFG=cb - Win32 Debug -!MESSAGE No configuration specified. Defaulting to cb - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "cb - Win32 Release" && "$(CFG)" != "cb - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE on this makefile -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cb.mak" CFG="cb - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cb - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "cb - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF -################################################################################ -# Begin Project -# PROP Target_Last_Scanned "cb - Win32 Debug" -CPP=cl.exe -RSC=rc.exe -MTL=mktyplib.exe - -!IF "$(CFG)" == "cb - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "$(OUTDIR)\cb.exe" - -CLEAN : - -@erase "$(INTDIR)\CacheTreeView.obj" - -@erase "$(INTDIR)\cb.obj" - -@erase "$(INTDIR)\cb.pch" - -@erase "$(INTDIR)\cb.res" - -@erase "$(INTDIR)\cbDoc.obj" - -@erase "$(INTDIR)\cbView.obj" - -@erase "$(INTDIR)\MainFrm.obj" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(OUTDIR)\cb.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I "..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I\ - "..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ - /D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/cb.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c -CPP_OBJS=.\Release/ -CPP_SBRS=.\. -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /win32 -MTL_PROJ=/nologo /D "NDEBUG" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -RSC_PROJ=/l 0x409 /fo"$(INTDIR)/cb.res" /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/cb.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /machine:I386 -LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)/cb.pdb"\ - /machine:I386 /out:"$(OUTDIR)/cb.exe" -LINK32_OBJS= \ - "$(INTDIR)\CacheTreeView.obj" \ - "$(INTDIR)\cb.obj" \ - "$(INTDIR)\cb.res" \ - "$(INTDIR)\cbDoc.obj" \ - "$(INTDIR)\cbView.obj" \ - "$(INTDIR)\MainFrm.obj" \ - "$(INTDIR)\StdAfx.obj" - -"$(OUTDIR)\cb.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -OUTDIR=.\Debug -INTDIR=.\Debug - -ALL : "$(OUTDIR)\cb.exe" "$(OUTDIR)\cb.bsc" - -CLEAN : - -@erase "$(INTDIR)\CacheTreeView.obj" - -@erase "$(INTDIR)\CacheTreeView.sbr" - -@erase "$(INTDIR)\cb.obj" - -@erase "$(INTDIR)\cb.pch" - -@erase "$(INTDIR)\cb.res" - -@erase "$(INTDIR)\cb.sbr" - -@erase "$(INTDIR)\cbDoc.obj" - -@erase "$(INTDIR)\cbDoc.sbr" - -@erase "$(INTDIR)\cbView.obj" - -@erase "$(INTDIR)\cbView.sbr" - -@erase "$(INTDIR)\MainFrm.obj" - -@erase "$(INTDIR)\MainFrm.sbr" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(INTDIR)\StdAfx.sbr" - -@erase "$(INTDIR)\vc40.idb" - -@erase "$(INTDIR)\vc40.pdb" - -@erase "$(OUTDIR)\cb.bsc" - -@erase "$(OUTDIR)\cb.exe" - -@erase "$(OUTDIR)\cb.ilk" - -@erase "$(OUTDIR)\cb.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache" /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /V"ERBOSE:lib" /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache"\ - /I "..\..\..\..\..\dist\win32_d.obj\include" /I\ - "..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D\ - "_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/cb.pch" /Yu"stdafx.h"\ - /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /V"ERBOSE:lib" /c -CPP_OBJS=.\Debug/ -CPP_SBRS=.\Debug/ -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /win32 -MTL_PROJ=/nologo /D "_DEBUG" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -RSC_PROJ=/l 0x409 /fo"$(INTDIR)/cb.res" /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/cb.bsc" -BSC32_SBRS= \ - "$(INTDIR)\CacheTreeView.sbr" \ - "$(INTDIR)\cb.sbr" \ - "$(INTDIR)\cbDoc.sbr" \ - "$(INTDIR)\cbView.sbr" \ - "$(INTDIR)\MainFrm.sbr" \ - "$(INTDIR)\StdAfx.sbr" - -"$(OUTDIR)\cb.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows /debug /machine:I386 -# SUBTRACT LINK32 /nodefaultlib -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows\ - /incremental:yes /pdb:"$(OUTDIR)/cb.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)/cb.exe" -LINK32_OBJS= \ - "$(INTDIR)\CacheTreeView.obj" \ - "$(INTDIR)\cb.obj" \ - "$(INTDIR)\cb.res" \ - "$(INTDIR)\cbDoc.obj" \ - "$(INTDIR)\cbView.obj" \ - "$(INTDIR)\MainFrm.obj" \ - "$(INTDIR)\StdAfx.obj" - -"$(OUTDIR)\cb.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -################################################################################ -# Begin Target - -# Name "cb - Win32 Release" -# Name "cb - Win32 Debug" - -!IF "$(CFG)" == "cb - Win32 Release" - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - -!ENDIF - -################################################################################ -# Begin Source File - -SOURCE=.\cb.cpp -DEP_CPP_CB_CP=\ - ".\cb.h"\ - ".\cbDoc.h"\ - ".\cbView.h"\ - ".\MainFrm.h"\ - ".\StdAfx.h"\ - - -!IF "$(CFG)" == "cb - Win32 Release" - - -"$(INTDIR)\cb.obj" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch" - - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - - -"$(INTDIR)\cb.obj" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch" - -"$(INTDIR)\cb.sbr" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch" - - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\StdAfx.cpp -DEP_CPP_STDAF=\ - ".\StdAfx.h"\ - - -!IF "$(CFG)" == "cb - Win32 Release" - -# ADD CPP /Yc"stdafx.h" - -BuildCmds= \ - $(CPP) /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I\ - "..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ - /D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/cb.pch" /Yc"stdafx.h" /Fo"$(INTDIR)/" /c\ - $(SOURCE) \ - - -"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" - $(BuildCmds) - -"$(INTDIR)\cb.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" - $(BuildCmds) - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - -# ADD CPP /Yc"stdafx.h" - -BuildCmds= \ - $(CPP) /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache"\ - /I "..\..\..\..\..\dist\win32_d.obj\include" /I\ - "..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D\ - "_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/cb.pch" /Yc"stdafx.h"\ - /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /V"ERBOSE:lib" /c $(SOURCE) \ - - -"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" - $(BuildCmds) - -"$(INTDIR)\StdAfx.sbr" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" - $(BuildCmds) - -"$(INTDIR)\cb.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" - $(BuildCmds) - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\MainFrm.cpp -DEP_CPP_MAINF=\ - ".\CacheTreeView.h"\ - ".\cb.h"\ - ".\MainFrm.h"\ - ".\StdAfx.h"\ - - -!IF "$(CFG)" == "cb - Win32 Release" - - -"$(INTDIR)\MainFrm.obj" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - - -"$(INTDIR)\MainFrm.obj" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - -"$(INTDIR)\MainFrm.sbr" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\cbDoc.cpp -DEP_CPP_CBDOC=\ - ".\CacheTreeView.h"\ - ".\cb.h"\ - ".\cbDoc.h"\ - ".\StdAfx.h"\ - - -!IF "$(CFG)" == "cb - Win32 Release" - - -"$(INTDIR)\cbDoc.obj" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - - -"$(INTDIR)\cbDoc.obj" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - -"$(INTDIR)\cbDoc.sbr" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\cbView.cpp - -!IF "$(CFG)" == "cb - Win32 Release" - -DEP_CPP_CBVIE=\ - "..\..\..\..\..\dist\public\cache\nsBkgThread.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheBkgThd.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheManager.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheModule.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheObject.h"\ - "..\..\..\..\..\dist\public\cache\nsCachePref.h"\ - "..\..\..\..\..\dist\public\cache\nsDiskModule.h"\ - "..\..\..\..\..\dist\public\cache\nsEnumeration.h"\ - "..\..\..\..\..\dist\public\cache\nsIterator.h"\ - "..\..\..\..\..\dist\public\cache\nsMemCacheObject.h"\ - "..\..\..\..\..\dist\public\cache\nsMemModule.h"\ - "..\..\..\..\..\dist\public\cache\nsMemStream.h"\ - "..\..\..\..\..\dist\public\cache\nsMonitorable.h"\ - "..\..\..\..\..\dist\public\cache\nsStream.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prmon.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prthread.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - ".\cb.h"\ - ".\cbDoc.h"\ - ".\cbView.h"\ - ".\MainFrm.h"\ - ".\nsTimeIt.h"\ - ".\StdAfx.h"\ - {$(INCLUDE)}"\sys\TYPES.H"\ - -NODEP_CPP_CBVIE=\ - "..\..\..\..\..\dist\public\cache\mcom_db.h"\ - "..\..\..\..\..\dist\public\cache\nsISupports.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\cbView.obj" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - -DEP_CPP_CBVIE=\ - "..\..\..\..\..\dist\public\cache\nsBkgThread.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheBkgThd.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheManager.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheModule.h"\ - "..\..\..\..\..\dist\public\cache\nsCacheObject.h"\ - "..\..\..\..\..\dist\public\cache\nsCachePref.h"\ - "..\..\..\..\..\dist\public\cache\nsDiskModule.h"\ - "..\..\..\..\..\dist\public\cache\nsEnumeration.h"\ - "..\..\..\..\..\dist\public\cache\nsIterator.h"\ - "..\..\..\..\..\dist\public\cache\nsMemCacheObject.h"\ - "..\..\..\..\..\dist\public\cache\nsMemModule.h"\ - "..\..\..\..\..\dist\public\cache\nsMemStream.h"\ - "..\..\..\..\..\dist\public\cache\nsMonitorable.h"\ - "..\..\..\..\..\dist\public\cache\nsStream.h"\ - "..\..\..\..\..\dist\public\dbm\cdefs.h"\ - "..\..\..\..\..\dist\public\dbm\mcom_db.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prmon.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prthread.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - ".\cb.h"\ - ".\cbDoc.h"\ - ".\cbView.h"\ - ".\MainFrm.h"\ - ".\nsTimeIt.h"\ - ".\StdAfx.h"\ - {$(INCLUDE)}"\sys\STAT.H"\ - {$(INCLUDE)}"\sys\TYPES.H"\ - -NODEP_CPP_CBVIE=\ - "..\..\..\..\..\dist\public\cache\nsISupports.h"\ - "..\..\..\..\..\dist\public\dbm\prmacos.h"\ - "..\..\..\..\..\dist\public\dbm\xp_mcom.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\cbView.obj" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - -"$(INTDIR)\cbView.sbr" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ENDIF - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\cb.rc -DEP_RSC_CB_RC=\ - ".\res\cacheico.bmp"\ - ".\res\cb.ico"\ - ".\res\cb.rc2"\ - ".\res\cbDoc.ico"\ - ".\res\Toolbar.bmp"\ - - -"$(INTDIR)\cb.res" : $(SOURCE) $(DEP_RSC_CB_RC) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE) - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=.\CacheTreeView.cpp -DEP_CPP_CACHE=\ - ".\CacheTreeView.h"\ - ".\cb.h"\ - ".\cbDoc.h"\ - ".\StdAfx.h"\ - - -!IF "$(CFG)" == "cb - Win32 Release" - - -"$(INTDIR)\CacheTreeView.obj" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ELSEIF "$(CFG)" == "cb - Win32 Debug" - - -"$(INTDIR)\CacheTreeView.obj" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - -"$(INTDIR)\CacheTreeView.sbr" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\ - "$(INTDIR)\cb.pch" - - -!ENDIF - -# End Source File -# End Target -# End Project -################################################################################ diff --git a/network/cache/nu/tests/fftest/fftest.mak b/network/cache/nu/tests/fftest/fftest.mak index 3dbc197578e..e69de29bb2d 100644 --- a/network/cache/nu/tests/fftest/fftest.mak +++ b/network/cache/nu/tests/fftest/fftest.mak @@ -1,329 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -!IF "$(CFG)" == "" -CFG=fftest - Win32 Debug -!MESSAGE No configuration specified. Defaulting to fftest - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "fftest - Win32 Release" && "$(CFG)" != "fftest - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE on this makefile -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fftest.mak" CFG="fftest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fftest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "fftest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF -################################################################################ -# Begin Project -# PROP Target_Last_Scanned "fftest - Win32 Debug" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fftest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -OUTDIR=.\Release -INTDIR=.\Release - -ALL : "$(OUTDIR)\fftest.exe" - -CLEAN : - -@erase "$(INTDIR)\FlatFileTest.obj" - -@erase "$(INTDIR)\nsFFEntry.obj" - -@erase "$(INTDIR)\nsFFObject.obj" - -@erase "$(INTDIR)\nsFlatFile.obj" - -@erase "$(INTDIR)\nsTOC.obj" - -@erase "$(OUTDIR)\fftest.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W4 /GX /O2 /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /ML /W4 /GX /O2 /I "..\..\..\..\..\dist\win32_d.obj\include"\ - /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ - /Fp"$(INTDIR)/fftest.pch" /YX /Fo"$(INTDIR)/" /c -CPP_OBJS=.\Release/ -CPP_SBRS=.\. -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/fftest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /machine:I386 -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\ - /incremental:no /pdb:"$(OUTDIR)/fftest.pdb" /machine:I386\ - /out:"$(OUTDIR)/fftest.exe" -LINK32_OBJS= \ - "$(INTDIR)\FlatFileTest.obj" \ - "$(INTDIR)\nsFFEntry.obj" \ - "$(INTDIR)\nsFFObject.obj" \ - "$(INTDIR)\nsFlatFile.obj" \ - "$(INTDIR)\nsTOC.obj" - -"$(OUTDIR)\fftest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "fftest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -OUTDIR=.\Debug -INTDIR=.\Debug - -ALL : "$(OUTDIR)\fftest.exe" - -CLEAN : - -@erase "$(INTDIR)\FlatFileTest.obj" - -@erase "$(INTDIR)\nsFFEntry.obj" - -@erase "$(INTDIR)\nsFFObject.obj" - -@erase "$(INTDIR)\nsFlatFile.obj" - -@erase "$(INTDIR)\nsTOC.obj" - -@erase "$(INTDIR)\vc40.idb" - -@erase "$(INTDIR)\vc40.pdb" - -@erase "$(OUTDIR)\fftest.exe" - -@erase "$(OUTDIR)\fftest.ilk" - -@erase "$(OUTDIR)\fftest.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W4 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -CPP_PROJ=/nologo /MLd /W4 /Gm /GX /Zi /Od /I\ - "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D\ - "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/fftest.pch" /YX /Fo"$(INTDIR)/"\ - /Fd"$(INTDIR)/" /c -CPP_OBJS=.\Debug/ -CPP_SBRS=.\. -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/fftest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\ - /incremental:yes /pdb:"$(OUTDIR)/fftest.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)/fftest.exe" -LINK32_OBJS= \ - "$(INTDIR)\FlatFileTest.obj" \ - "$(INTDIR)\nsFFEntry.obj" \ - "$(INTDIR)\nsFFObject.obj" \ - "$(INTDIR)\nsFlatFile.obj" \ - "$(INTDIR)\nsTOC.obj" - -"$(OUTDIR)\fftest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -################################################################################ -# Begin Target - -# Name "fftest - Win32 Release" -# Name "fftest - Win32 Debug" - -!IF "$(CFG)" == "fftest - Win32 Release" - -!ELSEIF "$(CFG)" == "fftest - Win32 Debug" - -!ENDIF - -################################################################################ -# Begin Source File - -SOURCE=.\FlatFileTest.cpp -DEP_CPP_FLATF=\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prio.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - "..\..\include\nsFFEntry.h"\ - "..\..\include\nsFFObject.h"\ - "..\..\include\nsFlatFile.h"\ - "..\..\include\nsTOC.h"\ - {$(INCLUDE)}"\sys\types.h"\ - -NODEP_CPP_FLATF=\ - "..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\FlatFileTest.obj" : $(SOURCE) $(DEP_CPP_FLATF) "$(INTDIR)" - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=\work\mozilla\network\cache\nu\src\nsFlatFile.cpp -DEP_CPP_NSFLA=\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prio.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prmem.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - "..\..\include\nsFlatFile.h"\ - {$(INCLUDE)}"\sys\types.h"\ - -NODEP_CPP_NSFLA=\ - "..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\nsFlatFile.obj" : $(SOURCE) $(DEP_CPP_NSFLA) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=\work\mozilla\network\cache\nu\src\nsFFObject.cpp -DEP_CPP_NSFFO=\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - "..\..\include\nsFFObject.h"\ - -NODEP_CPP_NSFFO=\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\nsFFObject.obj" : $(SOURCE) $(DEP_CPP_NSFFO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=\work\mozilla\network\cache\nu\src\nsTOC.cpp -DEP_CPP_NSTOC=\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prio.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - "..\..\include\nsFFEntry.h"\ - "..\..\include\nsFFObject.h"\ - "..\..\include\nsFlatFile.h"\ - "..\..\include\nsTOC.h"\ - {$(INCLUDE)}"\sys\types.h"\ - -NODEP_CPP_NSTOC=\ - "..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\nsTOC.obj" : $(SOURCE) $(DEP_CPP_NSTOC) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -################################################################################ -# Begin Source File - -SOURCE=\work\mozilla\network\cache\nu\src\nsFFEntry.cpp -DEP_CPP_NSFFE=\ - "..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prmem.h"\ - "..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\ - "..\..\include\nsFFEntry.h"\ - "..\..\include\nsFFObject.h"\ - -NODEP_CPP_NSFFE=\ - "..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\ - - -"$(INTDIR)\nsFFEntry.obj" : $(SOURCE) $(DEP_CPP_NSFFE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -# End Target -# End Project -################################################################################ diff --git a/network/module/makefile.win b/network/module/makefile.win index 4a90d4ed678..05d4ee63e87 100644 --- a/network/module/makefile.win +++ b/network/module/makefile.win @@ -116,7 +116,7 @@ NETLIBS=\ LLIBS=$(LLIBS) $(LIBNSPR) \ $(DIST)\lib\secfreenav32.lib \ $(DIST)\lib\libpwcac.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/network/module/tests/makefile.win b/network/module/tests/makefile.win index 3437c057fce..35adfc17c65 100644 --- a/network/module/tests/makefile.win +++ b/network/module/tests/makefile.win @@ -74,7 +74,7 @@ LLIBS=$(LLIBS) \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib LINCS=$(LINCS) -I. \ -I$(PUBLIC)\raptor \ diff --git a/network/module/tests/transportTest.cpp b/network/module/tests/transportTest.cpp index 23eecf68d16..5bea0a95f48 100644 --- a/network/module/tests/transportTest.cpp +++ b/network/module/tests/transportTest.cpp @@ -311,7 +311,6 @@ int main() nsresult result; int i; - PL_InitializeEventsLib(""); nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); diff --git a/parser/htmlparser/robot/makefile.win b/parser/htmlparser/robot/makefile.win index 80ad280d2ae..801647fab59 100644 --- a/parser/htmlparser/robot/makefile.win +++ b/parser/htmlparser/robot/makefile.win @@ -26,7 +26,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(NULL) diff --git a/parser/htmlparser/src/makefile.win b/parser/htmlparser/src/makefile.win index fb7e082c478..a7689781d56 100644 --- a/parser/htmlparser/src/makefile.win +++ b/parser/htmlparser/src/makefile.win @@ -135,7 +135,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ $(LIBNSPR) diff --git a/rdf/build/makefile.win b/rdf/build/makefile.win index 7af581b0aa2..d4373233228 100644 --- a/rdf/build/makefile.win +++ b/rdf/build/makefile.win @@ -43,7 +43,7 @@ LLIBS=\ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorhtml.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\js3250.lib \ diff --git a/rdf/tests/localfile/makefile.win b/rdf/tests/localfile/makefile.win index acd15dc296e..aa574b871fd 100644 --- a/rdf/tests/localfile/makefile.win +++ b/rdf/tests/localfile/makefile.win @@ -42,7 +42,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/rdf/tests/rdfsink/makefile.win b/rdf/tests/rdfsink/makefile.win index 04783751e10..280375727f4 100644 --- a/rdf/tests/rdfsink/makefile.win +++ b/rdf/tests/rdfsink/makefile.win @@ -42,7 +42,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/silentdl/makefile.win b/silentdl/makefile.win index e024c77cc30..3a2594565da 100644 --- a/silentdl/makefile.win +++ b/silentdl/makefile.win @@ -53,7 +53,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) OBJS = \ diff --git a/webshell/embed/ngprefs/win/makefile.win b/webshell/embed/ngprefs/win/makefile.win index a086c3fa750..b608bbc9a2c 100644 --- a/webshell/embed/ngprefs/win/makefile.win +++ b/webshell/embed/ngprefs/win/makefile.win @@ -31,7 +31,7 @@ LINCS = \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xppref32.lib \ OLE32.lib \ UUID.lib \ diff --git a/webshell/src/makefile.win b/webshell/src/makefile.win index ebbf9b1c947..ee3e983a867 100644 --- a/webshell/src/makefile.win +++ b/webshell/src/makefile.win @@ -74,7 +74,7 @@ LLIBS= \ $(DIST)\lib\raptorhtml.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ diff --git a/webshell/tests/imgtest/makefile.win b/webshell/tests/imgtest/makefile.win index 464c618c5fc..f6d61a79a97 100644 --- a/webshell/tests/imgtest/makefile.win +++ b/webshell/tests/imgtest/makefile.win @@ -35,7 +35,7 @@ LLIBS= \ $(DIST)\lib\raptorweb.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ comdlg32.lib diff --git a/webshell/tests/viewer/makefile.win b/webshell/tests/viewer/makefile.win index 0484a3cb531..196ffd56322 100644 --- a/webshell/tests/viewer/makefile.win +++ b/webshell/tests/viewer/makefile.win @@ -32,7 +32,7 @@ MISCDEP= \ $(DIST)\lib\raptorweb.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib OBJS = \ @@ -91,7 +91,7 @@ MYLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\jsdom.lib \ comdlg32.lib \ diff --git a/xpcom/libxpt/xptinfo/src/makefile.win b/xpcom/libxpt/xptinfo/src/makefile.win index 9ad7bab5b24..353c406b338 100644 --- a/xpcom/libxpt/xptinfo/src/makefile.win +++ b/xpcom/libxpt/xptinfo/src/makefile.win @@ -37,7 +37,7 @@ LLIBS = \ $(DIST)\lib\libxpt$(MOZ_BITS).lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) CSRCS = \ diff --git a/xpcom/reflect/xptinfo/src/makefile.win b/xpcom/reflect/xptinfo/src/makefile.win index 9ad7bab5b24..353c406b338 100644 --- a/xpcom/reflect/xptinfo/src/makefile.win +++ b/xpcom/reflect/xptinfo/src/makefile.win @@ -37,7 +37,7 @@ LLIBS = \ $(DIST)\lib\libxpt$(MOZ_BITS).lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) CSRCS = \ diff --git a/xpcom/src/makefile.win b/xpcom/src/makefile.win index 785591d23d5..44acae37b8a 100644 --- a/xpcom/src/makefile.win +++ b/xpcom/src/makefile.win @@ -28,7 +28,7 @@ LINCS = \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\libreg32.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ diff --git a/xpcom/src/nsEventQueueService.cpp b/xpcom/src/nsEventQueueService.cpp index ea37c6fe0e8..069b1295da7 100644 --- a/xpcom/src/nsEventQueueService.cpp +++ b/xpcom/src/nsEventQueueService.cpp @@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry() { NS_INIT_REFCNT(); -#ifdef XP_PC - // XXX: For now only use the main eventQ... When the event queue is - // created via PL_CreateNativeEventQueue(...) this can go away... - PL_InitializeEventsLib(""); - mEventQueue = PL_GetMainEventQueue(); -#else - mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread()); -#endif + mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread()); } EventQueueEntry::~EventQueueEntry() diff --git a/xpcom/tests/dynamic/makefile.win b/xpcom/tests/dynamic/makefile.win index b750d5b39be..8003ab784a9 100644 --- a/xpcom/tests/dynamic/makefile.win +++ b/xpcom/tests/dynamic/makefile.win @@ -28,7 +28,7 @@ LINCS = -I.. -I../../public LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/xpcom/tests/makefile.win b/xpcom/tests/makefile.win index 2928a1eb3cf..4e17318517b 100644 --- a/xpcom/tests/makefile.win +++ b/xpcom/tests/makefile.win @@ -38,7 +38,7 @@ LINCS=-I..\public -Iservices LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/xpcom/tests/services/makefile.win b/xpcom/tests/services/makefile.win index 48c337bb539..cfc5442e77e 100644 --- a/xpcom/tests/services/makefile.win +++ b/xpcom/tests/services/makefile.win @@ -28,7 +28,7 @@ LINCS = -I.. -I../../public LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/xpcom/tests/windows/makefile.win b/xpcom/tests/windows/makefile.win index ae11e011584..a1a4416b4c6 100644 --- a/xpcom/tests/windows/makefile.win +++ b/xpcom/tests/windows/makefile.win @@ -30,7 +30,7 @@ LLIBS= \ uuid.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/xpcom/threads/nsEventQueueService.cpp b/xpcom/threads/nsEventQueueService.cpp index ea37c6fe0e8..069b1295da7 100644 --- a/xpcom/threads/nsEventQueueService.cpp +++ b/xpcom/threads/nsEventQueueService.cpp @@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry() { NS_INIT_REFCNT(); -#ifdef XP_PC - // XXX: For now only use the main eventQ... When the event queue is - // created via PL_CreateNativeEventQueue(...) this can go away... - PL_InitializeEventsLib(""); - mEventQueue = PL_GetMainEventQueue(); -#else - mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread()); -#endif + mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread()); } EventQueueEntry::~EventQueueEntry() diff --git a/xpcom/tools/registry/makefile.win b/xpcom/tools/registry/makefile.win index 80120b188d5..b18e6a805bb 100644 --- a/xpcom/tools/registry/makefile.win +++ b/xpcom/tools/registry/makefile.win @@ -30,7 +30,7 @@ PROGRAMS = $(PROG1) LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ diff --git a/xpfe/AppCores/src/makefile.win b/xpfe/AppCores/src/makefile.win index 06cfcb49457..0e87027bb97 100644 --- a/xpfe/AppCores/src/makefile.win +++ b/xpfe/AppCores/src/makefile.win @@ -57,7 +57,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) OBJS = \ diff --git a/xpfe/apprunner/src/makefile.win b/xpfe/apprunner/src/makefile.win index 7fd2c0d3c2d..64e4dab9bb6 100644 --- a/xpfe/apprunner/src/makefile.win +++ b/xpfe/apprunner/src/makefile.win @@ -46,7 +46,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/appshell/src/makefile.win b/xpfe/appshell/src/makefile.win index ccc7a31c678..a66db953f02 100644 --- a/xpfe/appshell/src/makefile.win +++ b/xpfe/appshell/src/makefile.win @@ -62,7 +62,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/bootstrap/makefile.win b/xpfe/bootstrap/makefile.win index b67920e8d4e..fa957abdfb9 100644 --- a/xpfe/bootstrap/makefile.win +++ b/xpfe/bootstrap/makefile.win @@ -68,7 +68,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/browser/src/makefile.win b/xpfe/browser/src/makefile.win index 3f34960e908..9433356204f 100644 --- a/xpfe/browser/src/makefile.win +++ b/xpfe/browser/src/makefile.win @@ -54,7 +54,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/main/makefile.win b/xpfe/main/makefile.win index 384dd810ba7..8c4dca1837a 100644 --- a/xpfe/main/makefile.win +++ b/xpfe/main/makefile.win @@ -44,7 +44,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/tools/makefile.win b/xpfe/tools/makefile.win index 1fdc168d1ba..5c0212c688c 100644 --- a/xpfe/tools/makefile.win +++ b/xpfe/tools/makefile.win @@ -45,7 +45,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the exe LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/xpfe/xpviewer/src/makefile.win b/xpfe/xpviewer/src/makefile.win index aff5f897362..e69de29bb2d 100644 --- a/xpfe/xpviewer/src/makefile.win +++ b/xpfe/xpviewer/src/makefile.win @@ -1,228 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. - -DEPTH=..\..\.. -IGNORE_MANIFEST=1 - -MAKE_OBJ_TYPE = EXE -PROGRAM = .\$(OBJDIR)\xpviewer.exe -RESFILE = xpviewer.res - - -MISCDEP= \ - $(DIST)\lib\raptorweb.lib \ - $(DIST)\lib\xpcom32.lib \ - $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib - - -OBJS = \ - .\$(OBJDIR)\nsFindDialog.obj \ - .\$(OBJDIR)\nsXPBaseWindow.obj \ - .\$(OBJDIR)\nsBrowserWindow.obj \ - .\$(OBJDIR)\nsSetupRegistry.obj \ - .\$(OBJDIR)\nsViewerApp.obj \ - .\$(OBJDIR)\nsBrowserMain.obj \ - .\$(OBJDIR)\JSConsole.obj \ - $(NULL) - -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\dom \ - -I$(PUBLIC)\js \ - -I$(PUBLIC)\netlib \ - -I$(PUBLIC)\java \ - -I$(PUBLIC)\plugin \ - -I$(PUBLIC)\editor \ - -I$(PUBLIC)\pref \ -!ifdef MOZ_FULLCIRCLE - -I$(PUBLIC)\fullsoft \ -!endif - $(NULL) - -MYLIBS= \ - $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\raptorgfxwin.lib \ - $(DIST)\lib\raptorhtml.lib \ - $(DIST)\lib\raptorweb.lib \ - $(DIST)\lib\raptorwidget.lib \ - $(DIST)\lib\raptorhtmlpars.lib \ - $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\js32$(VERSION_NUMBER).lib \ - $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ - $(DIST)\lib\netlib.lib \ - $(DIST)\lib\jsdom.lib \ - comdlg32.lib \ -!ifdef MOZ_FULLCIRCLE - $(DIST)\lib\fulls32.lib \ -!endif - $(NULL) - -LLIBS= $(MYLIBS) \ - shell32.lib \ - -SUBSYSTEM:CONSOLE - -include <$(DEPTH)\config\rules.mak> - -!ifdef MOZ_NO_DEBUG_RTL -OS_CFLAGS = $(OS_CFLAGS) -DMOZ_NO_DEBUG_RTL -!endif - -install:: $(PROGRAM) - $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin - $(MAKE_INSTALL) resources\chrome\find.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) resources\throbber\LargeAnimation00.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation01.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation02.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation03.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation04.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation05.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation06.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation07.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation08.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation09.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation10.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation11.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation12.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation13.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation14.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation15.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation16.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation17.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation18.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation19.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation20.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation21.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation22.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation23.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation24.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation25.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation26.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation27.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation28.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation29.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation30.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation31.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation32.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation33.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation34.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation35.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation36.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation37.gif $(DIST)\bin\res\throbber - $(MAKE_INSTALL) resources\throbber\LargeAnimation38.gif $(DIST)\bin\res\throbber - - $(MAKE_INSTALL) resources\toolbar\DialogAddrIcon.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogAddrIcon_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogCompIcon.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogCompIcon_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogMailIcon.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogMailIcon_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogNavIcon.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\DialogNavIcon_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Back.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Back_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Back_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Bookmarks.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Bookmarks_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Edit.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Forward.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Forward_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Forward_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Home.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Home_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_HTab.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_HTab_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_LoadImages.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_LoadImages.mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Location.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Location_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MiniAddr.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MiniComp.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MiniMail.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MiniNav.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MiniTab.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MixSecurity.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_MixSecurity.mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Netscape.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Netscape_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_PersonalIcon.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Places.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Places_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Print.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Print_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Reload.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Reload_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Search.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Search_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Secure.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Secure_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Stop.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Stop.mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Stop_dis.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Stop_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Tab.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_TabSmall.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_TabSmall_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Tab_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Unsecure.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_Unsecure.mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_WhatsRelated.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\TB_WhatsRelated_mo.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\StatusBar-insecure.gif $(DIST)\bin\res\toolbar - $(MAKE_INSTALL) resources\toolbar\StatusBar-secure.gif $(DIST)\bin\res\toolbar - - -clobber:: - rm -f $(DIST)\bin\xpviewer.exe - rm -f $(DIST)\bin\res\samples\find.html - rm -f $(DIST)\bin\res\samples\test0.html - rm -f $(DIST)\bin\res\samples\test1.html - rm -f $(DIST)\bin\res\samples\test2.html - rm -f $(DIST)\bin\res\samples\test3.html - rm -f $(DIST)\bin\res\samples\test4.html - rm -f $(DIST)\bin\res\samples\test5.html - rm -f $(DIST)\bin\res\samples\test6.html - rm -f $(DIST)\bin\res\samples\test7.html - rm -f $(DIST)\bin\res\samples\test8.html - rm -f $(DIST)\bin\res\samples\test8siz.html - rm -f $(DIST)\bin\res\samples\test8sca.html - rm -f $(DIST)\bin\res\samples\test8tab.html - rm -f $(DIST)\bin\res\samples\test_ed.html - rm -f $(DIST)\bin\res\samples\test9.html - rm -f $(DIST)\bin\res\samples\test9a.html - rm -f $(DIST)\bin\res\samples\test9b.html - rm -f $(DIST)\bin\res\samples\raptor.jpg - rm -f $(DIST)\bin\res\samples\Anieyes.gif - rm -f $(DIST)\bin\res\samples\gear1.gif - rm -f $(DIST)\bin\res\samples\rock_gra.gif - rm -f $(DIST)\bin\res\samples\bg.jpg - rm -f $(DIST)\bin\res\throbber\anims00.gif - rm -f $(DIST)\bin\res\throbber\anims01.gif - rm -f $(DIST)\bin\res\throbber\anims02.gif - rm -f $(DIST)\bin\res\throbber\anims03.gif - rm -f $(DIST)\bin\res\throbber\anims04.gif - rm -f $(DIST)\bin\res\throbber\anims05.gif - rm -f $(DIST)\bin\res\throbber\anims06.gif - rm -f $(DIST)\bin\res\throbber\anims07.gif - rm -f $(DIST)\bin\res\throbber\anims08.gif - rm -f $(DIST)\bin\res\throbber\anims09.gif - rm -f $(DIST)\bin\res\throbber\anims10.gif - rm -f $(DIST)\bin\res\throbber\anims11.gif - rm -f $(DIST)\bin\res\throbber\anims12.gif - rm -f $(DIST)\bin\res\throbber\anims13.gif