NSPRPUB_LIB3_NAME_CHANGE_BRANCH: temporary place to hold theNSPRPUB_LIB3_NAME_CHANGE_BRANCH

NSPR library name changes (from libnspr21.so to libnspr3.so, etc.).

9 files changed, 44 insertions, 16 deletions

diff --git a/config/module.df b/config/module.df
index c43afbb3..c0d745be 100644
--- a/config/module.df
+++ b/config/module.df
@@ -20,4 +20,4 @@
 # A module is also called a component or a subsystem.
 
 MOD_NAME = nspr20
-MOD_VERSION = 21
+MOD_VERSION = 3
diff --git a/config/rules.mk b/config/rules.mk
index bded985e..3dd2f094 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -68,10 +68,10 @@ ifdef LIBRARY_NAME
 ifeq ($(OS_ARCH), WINNT)
 
 #
-# Win16 and OS/2 require library names conforming to the 8.3 rule.
+# Win95, Win16, and OS/2 require library names conforming to the 8.3 rule.
 # other platforms do not.
 #
-ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
+ifeq (,$(filter-out WIN95 WIN16 OS2,$(OS_TARGET)))
 LIBRARY		= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
 SHARED_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
diff --git a/lib/ds/Makefile b/lib/ds/Makefile
index 0a2021c6..fde8cae4 100644
--- a/lib/ds/Makefile
+++ b/lib/ds/Makefile
@@ -56,7 +56,11 @@ DLLBASE=/BASE:0x30000000
 RES=$(OBJDIR)/ds.res
 RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
 OS_LIBS = user32.lib
+ifeq ($(OS_TARGET),WIN95)
+EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
+else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
+endif
 
 ifdef MOZ_DEBUG
 ifdef GLOWCODE
diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile
index cca74076..34e82da2 100644
--- a/lib/libc/src/Makefile
+++ b/lib/libc/src/Makefile
@@ -63,7 +63,11 @@ else
 DLLBASE=/BASE:0x30000000
 RES=$(OBJDIR)/plc.res
 RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
+ifeq ($(OS_TARGET),WIN95)
+EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
+else
 EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
+endif
 
 ifdef MOZ_DEBUG
 ifdef GLOWCODE
diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile
index 706de958..1a9b9ff8 100644
--- a/lib/prstreams/Makefile
+++ b/lib/prstreams/Makefile
@@ -59,7 +59,11 @@ ifeq ($(OS_ARCH), WINNT)
         RES=$(OBJDIR)/prstrms.res
         RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
         OS_LIBS = user32.lib
-        EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
+        ifeq ($(OS_TARGET), WIN95)
+            EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
+        else
+            EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
+        endif
     endif
 else
     ifeq ($(OS_ARCH), AIX)
diff --git a/lib/prstreams/tests/testprstrm/Makefile b/lib/prstreams/tests/testprstrm/Makefile
index 64b0ceed..91869904 100644
--- a/lib/prstreams/tests/testprstrm/Makefile
+++ b/lib/prstreams/tests/testprstrm/Makefile
@@ -54,9 +54,14 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
   LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib
 else
-LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
-LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
+  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  ifeq ($(OS_TARGET), WIN95)
+    LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
+    LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
+  else
+    LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
+    LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
+  endif
 endif
 endif
 
diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index af284287..4d8a54a9 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -59,10 +59,16 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
   LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
 else
-LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
-LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
-LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX)
+  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  ifeq ($(OS_TARGET), WIN95)
+  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX)
+  else
+  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX)
+  endif
 endif
 endif
 
diff --git a/lib/tests/windows/makefile b/lib/tests/windows/makefile
index f0bea9bf..a2230624 100644
--- a/lib/tests/windows/makefile
+++ b/lib/tests/windows/makefile
@@ -35,9 +35,9 @@ ifeq ($(OS_TARGET), WIN16)
 else
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
-  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).lib
+  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
   else
   LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
   LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
diff --git a/pr/tests/Makefile b/pr/tests/Makefile
index 8b391d48..6e0c4625 100644
--- a/pr/tests/Makefile
+++ b/pr/tests/Makefile
@@ -187,8 +187,13 @@ else
 endif
 else
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
+  ifeq ($(OS_TARGET), WIN95)
+    LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
+    LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
+  else
+    LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
+    LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
+  endif
   ifdef PROFILE                                                                              
     LDOPTS += -PROFILE -MAP                                                                  
   endif # profile