From 5971d227ad7f1df7c05d41bdc375bc15c2835412 Mon Sep 17 00:00:00 2001
From: "cathleen%netscape.com"
 <cathleen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 11 Jan 2002 00:33:37 +0000
Subject: [PATCH] fix bug 118044, windows static build bustage. sr=waterson
 r=darin, timeless

git-svn-id: svn://10.0.0.236/trunk@111903 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/inspector/base/src/inBitmapURI.cpp |  4 ++--
 mozilla/extensions/inspector/build/src/makefile.win   |  2 +-
 mozilla/mailnews/mapi/mapiDll/makefile.win            |  1 +
 mozilla/mailnews/mapi/mapihook/build/makefile.win     |  2 +-
 mozilla/mailnews/mapi/mapihook/src/makefile.win       |  6 +++---
 mozilla/modules/staticmod/meta.mak                    | 11 ++++++++---
 mozilla/xpfe/bootstrap/makefile.win                   |  1 +
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/mozilla/extensions/inspector/base/src/inBitmapURI.cpp b/mozilla/extensions/inspector/base/src/inBitmapURI.cpp
index 621ef6bf707..e2762652185 100644
--- a/mozilla/extensions/inspector/base/src/inBitmapURI.cpp
+++ b/mozilla/extensions/inspector/base/src/inBitmapURI.cpp
@@ -29,7 +29,7 @@
 static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
 #define DEFAULT_IMAGE_SIZE          16
 
-void extractAttributeValue(const char * searchString, const char * attributeName, char ** result);
+static void extractAttributeValue(const char * searchString, const char * attributeName, char ** result);
  
 ////////////////////////////////////////////////////////////////////////////////
  
@@ -80,7 +80,7 @@ inBitmapURI::GetSpec(char* *aSpec)
 // containing just the attribute value. i.e you could pass in this string with
 // an attribute name of size, this will return 32
 // Assumption: attribute pairs in the string are separated by '&'.
-void extractAttributeValue(const char * searchString, const char * attributeName, char ** result)
+static void extractAttributeValue(const char * searchString, const char * attributeName, char ** result)
 {
   //NS_ENSURE_ARG_POINTER(extractAttributeValue);
 
diff --git a/mozilla/extensions/inspector/build/src/makefile.win b/mozilla/extensions/inspector/build/src/makefile.win
index 7ff3c14d51e..cc788b026b2 100644
--- a/mozilla/extensions/inspector/build/src/makefile.win
+++ b/mozilla/extensions/inspector/build/src/makefile.win
@@ -47,7 +47,7 @@ CPP_OBJS= \
 		.\$(OBJDIR)\nsInspectorModule.obj \
 		$(NULL)
 
-LLIBS= \
+SUB_LIBRARIES = \
 		$(DIST)\lib\xpcom.lib \
     $(DIST)\lib\rdfutil_s.lib \
     $(DIST)\lib\inspector_s.lib \
diff --git a/mozilla/mailnews/mapi/mapiDll/makefile.win b/mozilla/mailnews/mapi/mapiDll/makefile.win
index f8c3fd3d2af..e8ead7481b6 100644
--- a/mozilla/mailnews/mapi/mapiDll/makefile.win
+++ b/mozilla/mailnews/mapi/mapiDll/makefile.win
@@ -40,6 +40,7 @@ MODULE          = mozMapi32
 EXPORT_LIBRARY  = $(MODULE)
 LIBRARY_NAME    = $(MODULE)
 DEFFILE         = Mapi32.def
+META_COMPONENT  = mail
 
 REQUIRES	= MapiProxy \
                   msgMapi \
diff --git a/mozilla/mailnews/mapi/mapihook/build/makefile.win b/mozilla/mailnews/mapi/mapihook/build/makefile.win
index 2d42cf9645d..9aede1f2796 100644
--- a/mozilla/mailnews/mapi/mapihook/build/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/build/makefile.win
@@ -37,8 +37,8 @@
 DEPTH=..\..\..\..
 
 MODULE           = MapiProxy
-EXPORT_LIBRARY   = $(MODULE)
 LIBRARY_NAME     = $(MODULE)
+META_COMPONENT   = mail
 DEFFILE          = MapiProxy.def
 
 include <$(DEPTH)\config\config.mak>
diff --git a/mozilla/mailnews/mapi/mapihook/src/makefile.win b/mozilla/mailnews/mapi/mapihook/src/makefile.win
index d0183e183ce..e0582b05d4e 100644
--- a/mozilla/mailnews/mapi/mapihook/src/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/src/makefile.win
@@ -38,9 +38,9 @@
 DEPTH=..\..\..\..
 
 MODULE          = msgMapi
-MAKE_OBJ_TYPE = DLL
-LIBRARY_NAME=$(MODULE)
-MODULE_NAME	= $(MODULE)
+LIBRARY_NAME    =$(MODULE)
+MODULE_NAME     =msgMapiModule
+META_COMPONENT  =mail
 
 REQUIRES        = xpcom \
                   string \
diff --git a/mozilla/modules/staticmod/meta.mak b/mozilla/modules/staticmod/meta.mak
index c19ae7fb2cb..fb93a635b0b 100755
--- a/mozilla/modules/staticmod/meta.mak
+++ b/mozilla/modules/staticmod/meta.mak
@@ -51,15 +51,20 @@ LLIBS           = $(DIST)\lib\gkgfx.lib         \
                   $(DIST)\lib\unicharutil_s.lib \
                   $(LIBNSPR)
 
+WIN_LIBS        = rpcrt4.lib    \
+                  ole32.lib
+
+
 !ifdef MOZ_GECKO_DLL
 LLIBS           = $(LLIBS)                      \
                   $(DIST)\lib\png.lib           \
                   $(DIST)\lib\mng.lib           \
                   $(DIST)\lib\util.lib          \
                   $(DIST)\lib\expat.lib         \
-                  $(DIST)\lib\nsldap32v40.lib   
+                  $(DIST)\lib\nsldap32v40.lib
 
-WIN_LIBS        = comctl32.lib  \
+WIN_LIBS        = $(WIN_LIBS)
+                  comctl32.lib  \
                   comdlg32.lib  \
                   uuid.lib      \
                   ole32.lib     \
@@ -132,7 +137,7 @@ export::
 !endif
 
 
-install:: $(DLL)
+libs:: $(DLL)
         $(MAKE_INSTALL) $(DLL) $(DIST)/bin/components
 
 clobber::
diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win
index cc690828b46..a9583bbbc90 100644
--- a/mozilla/xpfe/bootstrap/makefile.win
+++ b/mozilla/xpfe/bootstrap/makefile.win
@@ -125,6 +125,7 @@ WIN_LIBS=       \
  ole32.lib      \
  oleaut32.lib   \
  version.lib    \
+ winspool.lib   \
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>