Fixing win32 static build bustage in activex & simple plugin.

Bug 120675 r=bryner sr=waterson a=asa


git-svn-id: svn://10.0.0.236/trunk@112424 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/makefile.win

@@ -119,17 +119,19 @@ export:: \
 !endif
         build_number  \
         nsBuildID.h   \
-!ifdef MOZ_COVERAGE
-        trace.dll     \
-!endif
         $(NULL)
+
 !ifdef MOZ_COVERAGE
+export:: trace.dll
        $(MAKE_INSTALL) trace.dll $(DIST)/bin
        $(MAKE_INSTALL) trace.lib $(DIST)/lib
        $(MAKE_INSTALL) trace.dll $(DIST)/install
        $(MAKE_INSTALL) $(DIST)/bin/nspr4.dll $(DIST)/install
 !endif
-      $(RM) $(DIST)\bin\chrome\chromelist.txt 
+
+export::
+	$(RM) $(DIST)\bin\chrome\chromelist.txt 
+	$(RM) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMPS) $(FINAL_LINK_COMP_NAMES)
 
 #install::
 #	$(RM) $(DIST)\bin\chrome\installed-chrome.txt

mozilla/embedding/browser/activex/src/control/makefile.win

@@ -90,6 +90,7 @@ OBJS =                                 \
 # removed.
 
 LLIBS=                          \
+ $(DIST)\lib\gkgfx.lib          \
  $(DIST)\lib\xpcom.lib          \
  $(DIST)\lib\baseembed_s.lib    \
  $(LIBNSPR)                     \

mozilla/modules/plugin/samples/simple/makefile.win

@@ -26,6 +26,9 @@ REQUIRES	= xpcom plugin string
 LIBRARY_NAME	= npsimple
 MODULE_NAME     = SimplePlugin
 
+# Set bogus meta component so that lib is not added to any final-link lists
+META_COMPONENT=bogus_plugin
+
 DEPTH = ..\..\..\..
 
 # Make sure that it builds but don't install it