diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak index 235edf7c383..8543b1f634d 100644 --- a/mozilla/config/config.mak +++ b/mozilla/config/config.mak @@ -347,7 +347,9 @@ MKCPYFLAGS= -i #// Common Libraries #// #//------------------------------------------------------------------------ -LIBNSPR=$(DIST)\lib\nspr3.lib $(DIST)\lib\plds3.lib $(DIST)\lib\plc3.lib +NSPR_VERSION=3 +LIBNSPR=$(DIST)\lib\nspr$(NSPR_VERSION).lib $(DIST)\lib\plds$(NSPR_VERSION).lib $(DIST)\lib\plc$(NSPR_VERSION).lib +LIBPLC=$(DIST)\lib\plc$(NSPR_VERSION).lib NSPRDIR = nsprpub CFLAGS = $(CFLAGS) -DNSPR20 diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index 72451c1e28e..2ce11a8c721 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -55,8 +55,6 @@ LLIBS= \ $(DIST)\lib\gkgfxwin.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plds3.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\caps.lib \ $(DIST)\lib\oji.lib \ $(DIST)\lib\timer_s.lib \ diff --git a/mozilla/extensions/wallet/cookieviewer/makefile.win b/mozilla/extensions/wallet/cookieviewer/makefile.win index 3d79e9a8846..0fbcbd22427 100644 --- a/mozilla/extensions/wallet/cookieviewer/makefile.win +++ b/mozilla/extensions/wallet/cookieviewer/makefile.win @@ -37,7 +37,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\ diff --git a/mozilla/extensions/wallet/editor/makefile.win b/mozilla/extensions/wallet/editor/makefile.win index d03da582782..236f4198a2f 100644 --- a/mozilla/extensions/wallet/editor/makefile.win +++ b/mozilla/extensions/wallet/editor/makefile.win @@ -37,7 +37,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\ diff --git a/mozilla/extensions/wallet/signonviewer/makefile.win b/mozilla/extensions/wallet/signonviewer/makefile.win index 936fa90214d..2629935fdee 100644 --- a/mozilla/extensions/wallet/signonviewer/makefile.win +++ b/mozilla/extensions/wallet/signonviewer/makefile.win @@ -37,7 +37,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\ diff --git a/mozilla/extensions/wallet/walletpreview/makefile.win b/mozilla/extensions/wallet/walletpreview/makefile.win index b2d808e8116..d818f51a50c 100644 --- a/mozilla/extensions/wallet/walletpreview/makefile.win +++ b/mozilla/extensions/wallet/walletpreview/makefile.win @@ -37,7 +37,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\ diff --git a/mozilla/mailnews/import/eudora/src/makefile.win b/mozilla/mailnews/import/eudora/src/makefile.win index 0e4aa6e271a..71ea577f7d1 100644 --- a/mozilla/mailnews/import/eudora/src/makefile.win +++ b/mozilla/mailnews/import/eudora/src/makefile.win @@ -37,7 +37,6 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/mailnews/import/oexpress/makefile.win b/mozilla/mailnews/import/oexpress/makefile.win index 9fe5e82402c..cf6efad7beb 100644 --- a/mozilla/mailnews/import/oexpress/makefile.win +++ b/mozilla/mailnews/import/oexpress/makefile.win @@ -45,7 +45,6 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/mailnews/import/outlook/src/makefile.win b/mozilla/mailnews/import/outlook/src/makefile.win index e28a0ee2d5f..5cb9572dbc9 100644 --- a/mozilla/mailnews/import/outlook/src/makefile.win +++ b/mozilla/mailnews/import/outlook/src/makefile.win @@ -43,7 +43,6 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/mailnews/import/src/makefile.win b/mozilla/mailnews/import/src/makefile.win index bce7717417f..fc7d2973f5c 100644 --- a/mozilla/mailnews/import/src/makefile.win +++ b/mozilla/mailnews/import/src/makefile.win @@ -47,7 +47,6 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/mailnews/import/text/src/makefile.win b/mozilla/mailnews/import/text/src/makefile.win index 951aa5cb26c..0bd28dbadc2 100644 --- a/mozilla/mailnews/import/text/src/makefile.win +++ b/mozilla/mailnews/import/text/src/makefile.win @@ -33,7 +33,6 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/netwerk/protocol/jar/src/makefile.win b/mozilla/netwerk/protocol/jar/src/makefile.win index 367b990e227..110903a4acd 100644 --- a/mozilla/netwerk/protocol/jar/src/makefile.win +++ b/mozilla/netwerk/protocol/jar/src/makefile.win @@ -30,7 +30,6 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= $(LLIBS) \ $(LIBNSPR) \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\zlib.lib \ $(NULL) diff --git a/mozilla/profile/Acctidl/makefile.win b/mozilla/profile/Acctidl/makefile.win index ca2cce6225b..08ef5710b18 100644 --- a/mozilla/profile/Acctidl/makefile.win +++ b/mozilla/profile/Acctidl/makefile.win @@ -36,7 +36,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\ diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win index 3f57b2d099a..c5d3bf13696 100644 --- a/mozilla/profile/src/makefile.win +++ b/mozilla/profile/src/makefile.win @@ -79,7 +79,7 @@ BINREL_DIST=$(XPDIST)\WIN954.0_DBG.OBJD LLIBS = \ $(LIBNSPR) \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(NULL) #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpcom/sample/makefile.win b/mozilla/xpcom/sample/makefile.win index 6913bed5c5e..ea5e73f921c 100644 --- a/mozilla/xpcom/sample/makefile.win +++ b/mozilla/xpcom/sample/makefile.win @@ -36,7 +36,7 @@ CPP_OBJS=\ LLIBS=\ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ + $(LIBPLC) \ $(NULL) LINCS=\