Got linux to compile.

A few errors fix when handling IID.

xpcom/proxy/Makefile.in

@@ -21,8 +21,7 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src
+DIRS	= public src tests
 
-DIRS    += tests
-
-include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk

xpcom/proxy/public/Makefile.in

@@ -0,0 +1,35 @@
+#!gmake
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= proxy 
+
+EXPORTS		= nsProxyEvent.h        \
+		  nsProxyObjectManager.h\
+		  $(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+

xpcom/proxy/src/Makefile.in

@@ -14,18 +14,24 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH		= ../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		    = xpcom
-LIBRARY_NAME	= xpproxy
+MODULE		= proxy
+LIBRARY_NAME	= proxy
+REQUIRES        = xpcom
 
-CPPSRCS		     =       \
-	nsProxyEvent.cpp     \
+CPPSRCS		     =            \
+	nsProxyEvent.cpp          \
+        nsProxyEventClass.cpp     \
+        nsProxyEventObject.cpp    \
+        nsProxyObjectManager.cpp  \
 	$(NULL)
 
+include $(topsrcdir)/config/config.mk
+
 include $(topsrcdir)/config/rules.mk

xpcom/proxy/src/nsProxyObjectManager.cpp

@@ -45,7 +45,7 @@ class nsProxyCreateInstance : public nsIProxyCreateInstance
     NS_IMETHOD CreateInstanceByProgID(const char *aProgID, nsISupports *aOuter, const nsIID & iid, void * *result);
 
     nsProxyCreateInstance();
-    ~nsProxyCreateInstance();
+    virtual ~nsProxyCreateInstance();
 
 };
 
@@ -58,8 +58,8 @@ nsProxyCreateInstance::nsProxyCreateInstance()
 nsProxyCreateInstance::~nsProxyCreateInstance()
 {
 }
-
-NS_IMPL_ISUPPORTS(nsProxyCreateInstance,NS_IPROXYCREATEINSTANCE_IID)
+static NS_DEFINE_IID(kIProxyCreateInstanceIID,NS_IPROXYCREATEINSTANCE_IID);
+NS_IMPL_ISUPPORTS(nsProxyCreateInstance, kIProxyCreateInstanceIID);
 
 NS_IMETHODIMP nsProxyCreateInstance::CreateInstanceByIID(const nsIID & cid, nsISupports *aOuter, const nsIID & iid, void * *result)
 {
@@ -94,8 +94,8 @@ NS_IMETHODIMP nsProxyCreateInstance::CreateInstanceByProgID(const char *aProgID,
 
 nsProxyObjectManager* nsProxyObjectManager::mInstance = nsnull;
 
-
-NS_IMPL_ISUPPORTS(nsProxyObjectManager, NS_IPROXYEVENT_MANAGER_IID)
+static NS_DEFINE_IID(kIProxyEventManager, NS_IPROXYEVENT_MANAGER_IID);
+NS_IMPL_ISUPPORTS(nsProxyObjectManager, kIProxyEventManager)
 
 nsProxyObjectManager::nsProxyObjectManager()
 {
@@ -318,7 +318,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path)
     printf("*** nsProxyObjectManager is being unregistered.  Na na na na hey hey\n");
 #endif
     
-    rv = compMgr->UnregisterFactory(kProxyObjectManagerCID, path);
+    rv = compMgr->UnregisterComponent(kProxyObjectManagerCID, path);
     if (NS_FAILED(rv)) goto done;
 
   done:

xpcom/proxy/tests/Makefile.in

@@ -21,16 +21,26 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= libproxy
+MODULE		= proxy
 
-SIMPLE_PROGRAMS	= main
+CPPSRCS         = proxytests.cpp
 
-CSRCS		= main.c
+LIBS		=     \
+        -L$(DIST)/bin \
+	-lxpcom       \
+	-lxpt \
+	-lxptcmd \
+	-lxptinfo \
+	-lreg       \
+	-lraptorbase \
+	-l$(MOZ_LIB_UTIL_PREFIX)util    \
+	$(NSPR_LIBS) 	\
+	$(NULL)
 
-LIBS		= 		\
-		  -L$(DIST)/bin \
-		  -lxpt 	\
-		  $(NULL)
+
+SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
+
+include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 

xpcom/proxy/tests/proxytests.cpp

@@ -132,7 +132,8 @@ nsTestXPCFoo::~nsTestXPCFoo()
 {
 }
 
-NS_IMPL_ISUPPORTS(nsTestXPCFoo,NS_ITESTXPCFOO_IID)
+static NS_DEFINE_IID(kITestXPCFooIID, NS_ITESTXPCFOO_IID);
+NS_IMPL_ISUPPORTS(nsTestXPCFoo,kITestXPCFooIID)
 
 NS_IMETHODIMP nsTestXPCFoo::Test(int p1, int p2, int* retval)
 {
@@ -173,9 +174,8 @@ nsTestXPCFoo2::nsTestXPCFoo2()
 nsTestXPCFoo2::~nsTestXPCFoo2()
 {
 }
-
-NS_IMPL_ISUPPORTS(nsTestXPCFoo2,NS_ITESTXPCFOO_IID)
-
+//kITestXPCFooIID defined above for nsTestXPCFoo(1)
+NS_IMPL_ISUPPORTS(nsTestXPCFoo2,kITestXPCFooIID)
 
 NS_IMETHODIMP nsTestXPCFoo2::Test(int p1, int p2, int* retval)
 {