fixes for archive rules

gconfig/WIN32.mk

@@ -43,9 +43,10 @@ PDB          = /PDB:$(PDBFILE)
 IMPFILE      = $(PROGRAM:.exe=.lib)
 IMP          = /IMPLIB:$(IMPFILE)
 XP_DEFINE   += -DXP_PC
-LIB_SUFFIX   = lib
+LIB_SUFFIX   = .lib
 DLL_SUFFIX   = dll
 OUT_NAME     = -out:
+ARCHIVE_SUFFIX = _s
 
 OS_LIBS = gdi32.lib kernel32.lib advapi32.lib user32.lib
 
@@ -53,7 +54,6 @@ GUI_LIBS =
 NSPR_LIBS = libplds21 libplc21 libnspr21 libmsgc21
 OPT_SLASH = /
 LIB_PREFIX      =
-LIB_SUFFIX      = .lib
 XP_REG_LIB      = libreg$(MOZ_BITS)
 
 

gconfig/ruleset.mk

@@ -106,11 +106,14 @@ ifdef LIBRARY_NAME
 		# Win16 requires library names conforming to the 8.3 rule.
 		# other platforms do not.
 		#
-		LIBRARY        = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+		LIBRARY        = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(LIB_SUFFIX)
-		SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+ifndef ARCHIVE_ONLY
-		IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+	    SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+		IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(LIB_SUFFIX)
+endif
 	else
 		LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
+ifndef ARCHIVE_ONLY
 		ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
 			SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)_shr.a
 		else
@@ -124,6 +127,7 @@ ifdef LIBRARY_NAME
 				PURE_LIBRARY = $(OBJDIR)/purelib$(LIBRARY_NAME).$(LIB_SUFFIX)
 			endif
 		endif
+endif
 	endif
 endif