From 16935478125b98fc7c7da32ccfb79db9fac81f44 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Sun, 30 Sep 2001 01:44:25 +0000
Subject: [PATCH] Split part of xpcom into separate xpcomglue library to be
 used for standalone builds eventually.  Start with nsCOMPtr.* Bug #99698
 r=rpotts sr=alecf

---
 xpcom/base/makefile.win  |  2 --
 xpcom/build/makefile.win |  1 +
 xpcom/makefile.win       | 48 ----------------------------------------
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/xpcom/base/makefile.win b/xpcom/base/makefile.win
index 2c0d24e9cbe..cf3f2cb1363 100644
--- a/xpcom/base/makefile.win
+++ b/xpcom/base/makefile.win
@@ -33,7 +33,6 @@ EXPORTS =                  \
         nsAgg.h            \
         nsIAllocator.h     \
         nsMemory.h         \
-        nsCOMPtr.h         \
         nsCom.h            \
 	nsComObsolete.h  \
         nsCWeakReference.h \
@@ -107,7 +106,6 @@ CPP_OBJS =                            \
         .\$(OBJDIR)\nsDebug.obj       \
         .\$(OBJDIR)\nsAllocator.obj   \
         .\$(OBJDIR)\nsMemoryImpl.obj   \
-        .\$(OBJDIR)\nsCOMPtr.obj      \
         .\$(OBJDIR)\nsCWeakReference.obj \
         .\$(OBJDIR)\nsID.obj          \
         .\$(OBJDIR)\nsIInterfaceRequestor.obj \
diff --git a/xpcom/build/makefile.win b/xpcom/build/makefile.win
index cdb526f08ed..6e65d6982f4 100644
--- a/xpcom/build/makefile.win
+++ b/xpcom/build/makefile.win
@@ -78,6 +78,7 @@ SUB_LIBRARIES =                           \
         $(DIST)\lib\string_s.lib          \
         $(DIST)\lib\string_obsolete_s.lib \
         $(DIST)\lib\mozreg.lib            \
+	$(DIST)\lib\xpcomglue.lib         \
         $(NULL)
 
 LLIBS = $(SUB_LIBRARIES)               \
diff --git a/xpcom/makefile.win b/xpcom/makefile.win
index d654851dfa3..e69de29bb2d 100644
--- a/xpcom/makefile.win
+++ b/xpcom/makefile.win
@@ -1,48 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=.. 
-
-
-
-DIRS=   typelib        \
-        base           \
-        ds             \
-        io             \
-        components     \
-        threads        \
-        reflect        \
-        proxy          \
-        build          \
-        tools          \
-!if defined(MOZ_DEBUG)
-        windbgdlg      \
-!endif
-!if !defined(DISABLE_TESTS)
-        sample         \
-        tests          \
-        reflect\xptinfo\tests \
-        reflect\xptcall\tests \
-        proxy\tests \
-!endif
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>