diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in
index c83366524a3..2315504868f 100644
--- a/mozilla/xpcom/Makefile.in
+++ b/mozilla/xpcom/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,33 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH	= ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=   typelib        \
-        base           \
-        ds             \
-        io             \
-        components     \
-        threads        \
-        reflect        \
-        proxy          \
-        build          \
-        tools          \
-        sample         \
-	$(NULL)
+DIRS		= typelib base ds io components threads reflect proxy build tools sample
 
 ifdef ENABLE_TESTS
-DIRS += tests
-endif
-
-ifeq ($(OS_ARCH),BeOS)
-EXTRA_DSO_LDOPTS += -lbe
+DIRS		+= tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/appshell/Makefile.in b/mozilla/xpcom/appshell/Makefile.in
index 72f563081ba..c3646aa8d9d 100644
--- a/mozilla/xpcom/appshell/Makefile.in
+++ b/mozilla/xpcom/appshell/Makefile.in
@@ -1,34 +1,32 @@
-#!gmake
-# 
+#
 # The contents of this file are subject to the Mozilla 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/MPL/
-# 
+#
 # 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 the Mozilla browser.
-# 
+#
 # The Initial Developer of the Original Code is Netscape
 # Communications, Inc.  Portions created by Netscape are
 # Copyright (C) 1999, Mozilla.  All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Travis Bogard <travis@netscape.com>
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = eventloop nativeApp 
-
-include $(topsrcdir)/config/config.mk
+DIRS		= eventloop nativeApp
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/appshell/eventloop/Makefile.in b/mozilla/xpcom/appshell/eventloop/Makefile.in
index ba3b8e6b59e..dedf91deff9 100644
--- a/mozilla/xpcom/appshell/eventloop/Makefile.in
+++ b/mozilla/xpcom/appshell/eventloop/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,20 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
-DIRS = xp
+DIRS		= xp
 
 ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += $(MOZ_WIDGET_TOOLKIT)
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/appshell/eventloop/photon/Makefile.in b/mozilla/xpcom/appshell/eventloop/photon/Makefile.in
index f96d64ed41f..e9f8e48e6df 100644
--- a/mozilla/xpcom/appshell/eventloop/photon/Makefile.in
+++ b/mozilla/xpcom/appshell/eventloop/photon/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -17,45 +16,44 @@
 #
 # Contributor(s):
 #   Jerry Kirk <Jerry.Kirk@NexwareCorp.com>
+#
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = eventloop
-MODULE=xpcom_eventloop_photon
-REQUIRES=xpcom
-IS_COMPONENT    = 1
+MODULE		= xpcom_eventloop_photon
+LIBRARY_NAME	= eventloop
+IS_COMPONENT	= 1
 
-CPPSRCS =					\
-	nsCPhEvent.cpp			\
-	nsCEvent.cpp 			\
-	nsCEventFilter.cpp 		\
-	nsCPlatformBaseLoop.cpp	\
-	nsCAppLoop.cpp
+REQUIRES	= xpcom
 
-LOCAL_INCLUDES += -I. -I../xp
+CPPSRCS		= \
+		nsCPhEvent.cpp \
+		nsCEvent.cpp \
+		nsCEventFilter.cpp \
+		nsCPlatformBaseLoop.cpp \
+		nsCAppLoop.cpp \
+		$(NULL)
 
-include $(topsrcdir)/config/config.mk
+LOCAL_INCLUDES	= -I. -I../xp
 
-CXXFLAGS +=  $(TK_CFLAGS)
+SHARED_LIBRARY_LIBS = ../xp/libxp_eventloop.a
 
-SHARED_LIBRARY_LIBS =			    \
-	../xp/libxp_eventloop.a \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS+=	       \
-	$(TOOLKIT_DSO_LDOPTS) \
-	$(MKSHLIB_FORCE_ALL)   \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(TOOLKIT_DSO_LDOPTS) \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(TK_CFLAGS)
+
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+
diff --git a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in
index d66bc8035d4..f66538f782a 100644
--- a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in
+++ b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,46 +13,39 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom_eventloop_xp
+LIBRARY_NAME	= xp_eventloop
 
-LIBRARY_NAME=xp_eventloop
+REQUIRES	= xpcom
 
-MODULE=xpcom_eventloop_xp
+CPPSRCS		= \
+		nsCBaseAppLoop.cpp \
+		nsCBaseBreathLoop.cpp \
+		nsCBaseLoop.cpp \
+		nsCBaseThreadLoop.cpp \
+		nsCLoopModule.cpp \
+		$(NULL)
 
-XPIDLSRCS =			 		\
-	nsCEventLoop.idl		\
-	nsIDispatchListener.idl	\
-	nsIEvent.idl			\
-	nsIEventFilter.idl		\
-	nsIEventLoop.idl		\
-	nsITranslateListener.idl\
-	nsPIEventLoop.idl		\
-	$(NULL)
+XPIDLSRCS	= \
+		nsCEventLoop.idl \
+		nsIDispatchListener.idl \
+		nsIEvent.idl \
+		nsIEventFilter.idl \
+		nsIEventLoop.idl \
+		nsITranslateListener.idl \
+		nsPIEventLoop.idl \
+		$(NULL)
 
-CPPSRCS = \
-	nsCBaseAppLoop.cpp		\
-	nsCBaseBreathLoop.cpp	\
-	nsCBaseLoop.cpp			\
-	nsCBaseThreadLoop.cpp	\
-	nsCLoopModule.cpp		\
-	$(NULL)
-
-LOCAL_INCLUDES += -I.
-
-ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES += -I../$(MOZ_WIDGET_TOOLKIT)
-CXXFLAGS += $(TK_CFLAGS)
-endif
-
-REQUIRES = xpcom
+LOCAL_INCLUDES	= -I.
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -61,3 +53,8 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
+LOCAL_INCLUDES	+= -I../$(MOZ_WIDGET_TOOLKIT)
+CXXFLAGS	+= $(TK_CFLAGS)
+endif
+
diff --git a/mozilla/xpcom/appshell/nativeApp/Makefile.in b/mozilla/xpcom/appshell/nativeApp/Makefile.in
index d88fb9b4388..cf5dcfe9d61 100644
--- a/mozilla/xpcom/appshell/nativeApp/Makefile.in
+++ b/mozilla/xpcom/appshell/nativeApp/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,35 +13,32 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME=nativeapp
-MODULE=xpcom_nativeapp
-IS_COMPONENT    = 1
+MODULE		= xpcom_nativeapp
+LIBRARY_NAME	= nativeapp
+IS_COMPONENT	= 1
 
-XPIDLSRCS =			 	\
-	nsCNativeApp.idl	\
-	nsINativeApp.idl
+REQUIRES	= xpcom
 
-CPPSRCS = \
-	nsCNativeAppImpl.cpp	\
-	nsCNativeAppModule.cpp
+CPPSRCS		= \
+		nsCNativeAppImpl.cpp \
+		nsCNativeAppModule.cpp \
+		$(NULL)
 
-LOCAL_INCLUDES += -I.
+XPIDLSRCS	= \
+		nsCNativeApp.idl \
+		nsINativeApp.idl \
+		$(NULL)
 
-ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES += -I../$(MOZ_WIDGET_TOOLKIT)
-CXXFLAGS += $(TK_CFLAGS)
-endif
-
-REQUIRES = xpcom
+LOCAL_INCLUDES	= -I.
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -50,5 +46,10 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
+LOCAL_INCLUDES	+= -I../$(MOZ_WIDGET_TOOLKIT)
+CXXFLAGS	+= $(TK_CFLAGS)
+endif
+
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 
diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in
index 403c395958f..0eef99a0a04 100644
--- a/mozilla/xpcom/base/Makefile.in
+++ b/mozilla/xpcom/base/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,63 +13,54 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_base
+LIBRARY_NAME	= xpcombase_s
 
-LIBRARY_NAME = xpcombase_s
+REQUIRES	= xpcom
 
-MODULE = xpcom
-XPIDL_MODULE = xpcom_base
+CPPSRCS		= \
+		nsAllocator.cpp \
+		nsDebug.cpp \
+		nsTraceRefcnt.cpp \
+		nsCOMPtr.cpp \
+		nsID.cpp \
+		nsWeakReference.cpp \
+		$(NULL)
 
-XPIDLSRCS =               \
-	nsrootidl.idl   \
-	nsISupports.idl \
-	nsIWeakReference.idl \
-	$(NULL)
+EXPORTS		= \
+		nsAgg.h \
+		nsIAllocator.h \
+		nsCOMPtr.h \
+		nsCom.h \
+		nsDebug.h \
+		nsError.h \
+		nsID.h \
+		nsIID.h \
+		nsIPtr.h \
+		nsISupportsUtils.h \
+		nsTraceRefcnt.h \
+		nsWeakReference.h \
+		nsWeakPtr.h \
+		nscore.h \
+		$(NULL)
 
-CPPSRCS =				\
-	nsAllocator.cpp			\
-	nsDebug.cpp			\
-	nsTraceRefcnt.cpp		\
-	nsCOMPtr.cpp			\
-	nsID.cpp			\
-	nsWeakReference.cpp			\
-	$(NULL)
+XPIDLSRCS	= \
+		nsrootidl.idl \
+		nsISupports.idl \
+		nsIWeakReference.idl \
+		$(NULL)
 
-EXPORTS = \
-        nsAgg.h            \
-        nsIAllocator.h     \
-        nsCOMPtr.h         \
-        nsCom.h            \
-        nsDebug.h          \
-        nsError.h          \
-        nsID.h             \
-	nsIID.h            \
-	nsIPtr.h           \
-        nsISupportsUtils.h \
-        nsTraceRefcnt.h    \
-        nsWeakReference.h  \
-        nsWeakPtr.h        \
-        nscore.h           \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-DEFINES += -D_IMPL_NS_COM
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
-endif
-REQUIRES = xpcom
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -78,3 +68,9 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COM
+
+ifeq ($(OS_ARCH), Linux)
+DEFINES		+= -D_BSD_SOURCE
+endif
+
diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in
index 1c72730e5cb..7db3728d68e 100644
--- a/mozilla/xpcom/build/Makefile.in
+++ b/mozilla/xpcom/build/Makefile.in
@@ -22,13 +22,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= xpcom
 MODULE		= xpcom
-
-CPPSRCS		= nsXPComInit.cpp
+LIBRARY_NAME	= xpcom
 
 REQUIRES	= xpcom
 
+CPPSRCS		= nsXPComInit.cpp
+
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libxpcomds_s.a \
 		$(DIST)/lib/libxpcomio_s.a \
@@ -61,7 +61,7 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 ifdef MOZ_DEMANGLE_SYMBOLS
-  EXTRA_DSO_LDOPTS += -liberty
+EXTRA_DSO_LDOPTS += -liberty
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in
index 817656346d0..c90fb1db4e7 100644
--- a/mozilla/xpcom/components/Makefile.in
+++ b/mozilla/xpcom/components/Makefile.in
@@ -35,13 +35,6 @@ CPPSRCS		= \
 		xcDll.cpp \
 		$(NULL)
 
-XPIDLSRCS	= \
-		nsIComponentLoader.idl	\
-		nsIComponentManager.idl \
-		nsIFactory.idl	\
-		nsIModule.idl	\
-		$(NULL)
-
 EXPORTS		= \
 		nsComponentManagerUtils.h \
 		nsIGenericFactory.h \
@@ -52,18 +45,22 @@ EXPORTS		= \
 		nsXPComFactory.h \
 		$(NULL)
 
+XPIDLSRCS	= \
+		nsIComponentLoader.idl \
+		nsIComponentManager.idl \
+		nsIFactory.idl \
+		nsIModule.idl \
+		$(NULL)
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
+LOCAL_INCLUDES	= -I$(srcdir)/../base -I$(srcdir)/../thread
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-LOCAL_INCLUDES	+= \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../thread \
-		$(NULL)
+DEFINES		+= -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE
 
diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in
index d8c0f89cd39..db9ae54c62a 100644
--- a/mozilla/xpcom/ds/Makefile.in
+++ b/mozilla/xpcom/ds/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,104 +13,97 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
 
-LIBRARY_NAME = xpcomds_s
+REQUIRES	= xpcom uconv unicharutil
 
-MODULE = xpcom
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsPageMgr.cpp \
+		nsProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStr.cpp \
+		nsString.cpp \
+		nsString2.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVariant.cpp \
+		nsVoidArray.cpp \
+		nsXPIDLString.cpp \
+		plvector.cpp \
+		nsTextFormater.cpp \
+		$(NULL)
 
-XPIDL_MODULE = xpcom_ds
+EXPORTS		= \
+		nsAVLTree.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsIPageManager.h \
+		nsIProperties.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsIVariant.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStr.h \
+		nsString.h \
+		nsString2.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsXPIDLString.h \
+		plvector.h \
+		nsTextFormater.h \
+		$(NULL)			
 
-XPIDLSRCS =			\
-	nsIAtom.idl	   \
-    nsICollection.idl	   \
-	nsIEnumerator.idl	   \
-    nsIObserver.idl        \
-    nsIObserverService.idl \
-	nsISupportsArray.idl	\
-	nsISupportsPrimitives.idl	\
-	$(NULL)
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsISupportsArray.idl \
+		nsISupportsPrimitives.idl \
+		$(NULL)
 
-CPPSRCS =				\
-	nsArena.cpp                   \
-	nsAtomTable.cpp               \
-	nsAVLTree.cpp                 \
-	nsByteBuffer.cpp              \
-	nsCRT.cpp                     \
-	nsConjoiningEnumerator.cpp    \
-	nsDeque.cpp                   \
-	nsEmptyEnumerator.cpp         \
-	nsEnumeratorUtils.cpp         \
-	nsHashtable.cpp               \
-	nsHashtableEnumerator.cpp     \
-	nsObserver.cpp                \
-	nsObserverList.cpp            \
-	nsObserverService.cpp         \
-	nsPageMgr.cpp                 \
-	nsProperties.cpp              \
-	nsQuickSort.cpp               \
-	nsSizeOfHandler.cpp           \
-	nsStr.cpp                     \
-	nsString.cpp                  \
-	nsString2.cpp                 \
-	nsSupportsArray.cpp           \
-	nsSupportsArrayEnumerator.cpp \
-	nsSupportsPrimitives.cpp      \
-	nsUnicharBuffer.cpp           \
-	nsVariant.cpp                 \
-	nsVoidArray.cpp               \
-	nsXPIDLString.cpp             \
-	plvector.cpp                  \
-	nsTextFormater.cpp                  \
-	$(NULL)
-
-EXPORTS = \
-	nsAVLTree.h                \
-	nsCppSharedAllocator.h		 \
-	nsCRT.h                    \
-	nsDeque.h                  \
-	nsEnumeratorUtils.h        \
-	nsHashtable.h              \
-	nsHashtableEnumerator.h    \
-	nsIArena.h                 \
-	nsIByteBuffer.h            \
-	nsIObserverList.h          \
-	nsIPageManager.h           \
-	nsIProperties.h            \
-	nsISimpleEnumerator.h      \
-	nsISizeOfHandler.h         \
-	nsIUnicharBuffer.h         \
-	nsIVariant.h               \
-	nsInt64.h                  \
-	nsQuickSort.h              \
-	nsStr.h                    \
-	nsString.h                 \
-	nsString2.h                \
-	nsSupportsPrimitives.h     \
-	nsTime.h                   \
-	nsUnitConversion.h         \
-	nsVector.h                 \
-	nsVoidArray.h              \
-	nsXPIDLString.h            \
-	plvector.h                 \
-	nsTextFormater.h                \
-	$(NULL)			
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-REQUIRES = xpcom uconv unicharutil
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -119,3 +111,5 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in
index 08075c7fa8b..d5c66a232b2 100644
--- a/mozilla/xpcom/io/Makefile.in
+++ b/mozilla/xpcom/io/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,69 +13,57 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_io
+LIBRARY_NAME	= xpcomio_s
 
-LIBRARY_NAME = xpcomio_s
+REQUIRES	= xpcom uconv unicharutil
 
-MODULE = xpcom
+CPPSRCS		= \
+		nsEscape.cpp \
+		nsFileSpec.cpp \
+		nsFileSpecStreaming.cpp \
+		nsFileStream.cpp \
+		nsFileSpecImpl.cpp \
+		nsIFileStream.cpp \
+		nsIStringStream.cpp \
+		nsSegmentedBuffer.cpp \
+		nsPipe2.cpp \
+		nsSpecialSystemDirectory.cpp \
+		nsUnicharInputStream.cpp \
+		$(NULL)
 
-XPIDL_MODULE = xpcom_io
+EXPORTS		= \
+		nsEscape.h \
+		nsFileSpec.h \
+		nsFileSpecStreaming.h \
+		nsFileStream.h \
+		nsIFileStream.h \
+		nsIStringStream.h \
+		nsIUnicharInputStream.h \
+		nsSpecialSystemDirectory.h \
+		$(NULL)			
 
-XPIDLSRCS =			  \
-	nsIPipe.idl		  \
-	nsIFileSpec.idl		  \
-        nsIBaseStream.idl	  \
-        nsIInputStream.idl	  \
-        nsIOutputStream.idl	  \
-        nsIBufferInputStream.idl  \
-        nsIBufferOutputStream.idl \
-	$(NULL)
+XPIDLSRCS	= \
+		nsIPipe.idl \
+		nsIFileSpec.idl \
+		nsIBaseStream.idl \
+		nsIInputStream.idl \
+		nsIOutputStream.idl \
+		nsIBufferInputStream.idl \
+		nsIBufferOutputStream.idl \
+		$(NULL)
 
-CPPSRCS =			     \
-	nsEscape.cpp                 \
-	nsFileSpec.cpp               \
-	nsFileSpecStreaming.cpp      \
-	nsFileStream.cpp             \
-	nsFileSpecImpl.cpp           \
-	nsIFileStream.cpp            \
-	nsIStringStream.cpp          \
-	nsSegmentedBuffer.cpp        \
-	nsPipe2.cpp                  \
-	nsSpecialSystemDirectory.cpp \
-	nsUnicharInputStream.cpp     \
-	$(NULL)
-
-EXPORTS = \
-	nsEscape.h                 \
-	nsFileSpec.h               \
-	nsFileSpecStreaming.h      \
-	nsFileStream.h             \
-	nsIFileStream.h            \
-	nsIStringStream.h          \
-	nsIUnicharInputStream.h    \
-	nsSpecialSystemDirectory.h \
-	$(NULL)			
-
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
-endif
-
-REQUIRES = xpcom uconv unicharutil
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -84,3 +71,9 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+ifeq ($(OS_ARCH), Linux)
+DEFINES		+= -D_BSD_SOURCE
+endif
+
diff --git a/mozilla/xpcom/proxy/Makefile.in b/mozilla/xpcom/proxy/Makefile.in
index 8235fd9405a..5e7880630a7 100644
--- a/mozilla/xpcom/proxy/Makefile.in
+++ b/mozilla/xpcom/proxy/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,4 +27,6 @@ DIRS		= public src
 ifdef ENABLE_TESTS
 DIRS		+= tests
 endif
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/proxy/public/Makefile.in b/mozilla/xpcom/proxy/public/Makefile.in
index 76f830070cf..6986f18e214 100644
--- a/mozilla/xpcom/proxy/public/Makefile.in
+++ b/mozilla/xpcom/proxy/public/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,31 +13,27 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH       = ../../..
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE      = xpcom
+MODULE		= xpcom
+XPIDL_MODULE	= proxyObjInst
 
-XPIDL_MODULE = proxyObjInst
+EXPORTS		= \
+		nsProxyEvent.h \
+		nsProxyObjectManager.h \
+		nsProxiedService.h \
+		$(NULL)
 
-XPIDLSRCS =                        \
-        nsIProxyCreateInstance.idl \
-        $(NULL)
+XPIDLSRCS	= nsIProxyCreateInstance.idl
 
-EXPORTS     =	\
-	nsProxyEvent.h        	\
-	nsProxyObjectManager.h	\
-	nsProxiedService.h	\
-	$(NULL)
-
-EXPORTS     := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/proxy/src/Makefile.in b/mozilla/xpcom/proxy/src/Makefile.in
index fea48b39266..6c06c03761a 100644
--- a/mozilla/xpcom/proxy/src/Makefile.in
+++ b/mozilla/xpcom/proxy/src/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -23,19 +24,19 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcomproxy_s
-REQUIRES        = xpcom
 
-CPPSRCS		     =            \
-	nsProxyEvent.cpp          \
-        nsProxyEventClass.cpp     \
-        nsProxyEventObject.cpp    \
-        nsProxyObjectManager.cpp  \
-	$(NULL)
+REQUIRES	= xpcom
 
-include $(topsrcdir)/config/config.mk
+CPPSRCS		= \
+		nsProxyEvent.cpp \
+		nsProxyEventClass.cpp \
+		nsProxyEventObject.cpp \
+		nsProxyObjectManager.cpp \
+		$(NULL)
 
 # No shared lib; Force creation of static lib
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/Makefile.in b/mozilla/xpcom/reflect/Makefile.in
index f9756ad95d3..226539a2eb5 100644
--- a/mozilla/xpcom/reflect/Makefile.in
+++ b/mozilla/xpcom/reflect/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,18 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = xptinfo xptcall
-
-#ifdef ENABLE_TESTS
-#DIRS += tests
-#endif
+DIRS		= xptinfo xptcall
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptcall/Makefile.in b/mozilla/xpcom/reflect/xptcall/Makefile.in
index 8bda381605e..279584cd21c 100644
--- a/mozilla/xpcom/reflect/xptcall/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/Makefile.in
@@ -16,13 +16,11 @@
 #
 
 DEPTH		= ../../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 
 DIRS		= public src
 
@@ -31,3 +29,4 @@ DIRS		+= tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptcall/public/Makefile.in b/mozilla/xpcom/reflect/xptcall/public/Makefile.in
index 30923122a3b..682393e528b 100644
--- a/mozilla/xpcom/reflect/xptcall/public/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/public/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -23,7 +24,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 
-EXPORTS =	xptcall.h	\
+EXPORTS		= \
+		xptcall.h \
 		xptcstubsdecl.inc \
 		xptcstubsdef.inc \
 		$(NULL)
@@ -31,3 +33,4 @@ EXPORTS =	xptcall.h	\
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptcall/src/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/Makefile.in
index da74eca799d..86e55b406fc 100644
--- a/mozilla/xpcom/reflect/xptcall/src/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -24,19 +25,17 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 LIBRARY_NAME	= xptcall
 
-DIRS = md
-
-DEFINES	+= -DEXPORT_XPTC_API
-
-CPPSRCS		= xptcall.cpp 	\
-		  $(NULL)
-
 REQUIRES	= xpcom
 
+DIRS		= md
+
+CPPSRCS		= xptcall.cpp
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-# export:: libs
-
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DEXPORT_XPTC_API
+
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in
index 13cb4de9485..e6183dc5bc5 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -16,16 +15,14 @@
 # Reserved.
 #
 
-DEPTH=../../../../..
-
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
-DIRS = unix
+DIRS		= unix
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in
index e9ce642c272..8c135eb5147 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -16,27 +15,24 @@
 # Reserved.
 #
 
-DEPTH           = ../../../../../..
-
+DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
-CFLAGS	+= -DEXPORT_XPC_API 
-
+MODULE		= xpconnect
 LIBRARY_NAME	= xptcmd
 
-MODULE		= xpconnect
-
-CPPSRCS=	            \
-	xptcinvoke_emx.cpp \
-	xptcstubs_emx.cpp  \
-	$(NULL)
+CPPSRCS		= \
+		xptcinvoke_emx.cpp \
+		xptcstubs_emx.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CFLAGS		+= -DEXPORT_XPC_API
+
 INCLUDES	+= -I$(srcdir)/../..
+
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/test/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/test/Makefile.in
index 6212ab0e16e..472d04ab638 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/test/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/test/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -16,21 +15,16 @@
 # Reserved.
 #
 
-DEPTH=../../../../../..
-
+DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+SIMPLE_PROGRAMS	= invoke_test
 
-
-SIMPLE_PROGRAMS = invoke_test
-
-CPPSRCS = \
-        invoke_test.cpp \
-        $(NULL)
+CPPSRCS		= invoke_test.cpp
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 3d22bd19d4a..551a775e208 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -17,161 +17,149 @@
 
 DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= xptcmd
 MODULE		= xpcom
+LIBRARY_NAME	= xptcmd
+
+#
+# The default is this buildable, but non-functioning code.
+#
+CPPSRCS		= xptcinvoke_unsupported.cpp xptcstubs_unsupported.cpp
 
 include $(topsrcdir)/config/config.mk
 
-# the default is this buildable non-functioning code
-CPPSRCS		= \
-		  xptcinvoke_unsupported.cpp \
-		  xptcstubs_unsupported.cpp \
-		  $(NULL)
-
+######################################################################
+# i386 and beyond
+######################################################################
+#
 # Lots of Unixish x86 flavors
+#
 ifneq (,$(filter SunOS Linux FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH)))
 ifeq (86,$(findstring 86,$(OS_TEST)))
-CPPSRCS		= \
-		  xptcinvoke_unixish_x86.cpp \
-		  xptcstubs_unixish_x86.cpp \
-		  $(NULL)
+CPPSRCS		= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
 endif
 endif
-
+#
 # BeOS/Intel (uses the same unixish_x86 code)
-ifeq ($(OS_ARCH),BeOS)
-ifeq ($(OS_TEST),BePC)
-CPPSRCS		= \
-		  xptcinvoke_unixish_x86.cpp \
-		  xptcstubs_unixish_x86.cpp \
-		  $(NULL)
+#
+ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+CPPSRCS		= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
 endif
-endif
-
+#
 # Neutrino/Intel (uses the same unixish_x86 code)
+#
 ifeq ($(OS_TARGET)$(OS_TEST),NTOx86)
-CPPSRCS		= \
-		  xptcinvoke_unixish_x86.cpp \
-		  xptcstubs_unixish_x86.cpp \
-		  $(NULL)
+CPPSRCS		= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
 endif
 
-# Solaris/sparc
-ifeq ($(OS_ARCH),SunOS)
-ifneq (86,$(findstring 86,$(OS_TEST)))
-CPPSRCS		= \
-		  xptcinvoke_sparc_solaris.cpp \
-		  xptcstubs_sparc_solaris.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcinvoke_asm_sparc_solaris_GCC.s \
-		  xptcstubs_asm_sparc_solaris.s \
-		  $(NULL)
-endif
-endif
-
-ifeq ($(OS_ARCH),Linux)
-# Linux/sparc
-ifeq ($(OS_TEST),sparc)
-CPPSRCS		= \
-		  xptcinvoke_sparc_solaris.cpp \
-		  xptcstubs_sparc_solaris.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcinvoke_asm_sparc_linux.s \
-		  xptcstubs_asm_sparc_solaris.s \
-		  $(NULL)
-endif
+######################################################################
+# Alpha
+######################################################################
+#
 # Linux/Alpha
-ifeq ($(OS_TEST),alpha)
-CPPSRCS		= \
-		  xptcinvoke_linux_alpha.cpp \
-		  xptcstubs_linux_alpha.cpp \
-		  $(NULL)
-endif
-# Linux/ARM
-ifneq (,$(filter arm32 armv4l sa110,$(OS_TEST)))
-CPPSRCS		= \
-		  xptcinvoke_arm.cpp \
-		  xptcstubs_arm.cpp \
-		  $(NULL)
+#
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxalpha)
+CPPSRCS		= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
 endif
+#
+# OpenVMS/Alpha
+#
+ifeq ($(OS_ARCH)$(CPU_ARCH),OpenVMSAlpha)
+CPPSRCS		= xptcinvoke_openvms_alpha.cpp xptcstubs_openvms_alpha.cpp
+ASFILES		= xptcinvoke_asm_openvms_alpha.s xptcstubs_asm_openvms_alpha.s
 endif
 
+######################################################################
+# ARM
+######################################################################
+#
+# Linux/ARM
+#
+ifeq ($(OS_ARCH),Linux)
+ifneq (,$(filter arm32 armv4l sa110,$(OS_TEST)))
+CPPSRCS		= xptcinvoke_arm.cpp xptcstubs_arm.cpp
+endif
+endif
+#
+# NetBSD/ARM
+#
+#ifeq ($(OS_ARCH),NetBSD)
+#ifneq (,$(filter arm32 armv4l sa110,$(OS_TEST)))
+#CPPSRCS		= xptcinvoke_arm.cpp xptcstubs_arm.cpp
+#endif
+#endif
+
+######################################################################
+# HPPA
+######################################################################
+#
 # HP-UX/PA32
+#
 # for gas and gcc, check comment in xptcinvoke_asm_pa32.s
 ifeq ($(OS_ARCH),HP-UX)
 ifneq ($(CC),gcc)
-CPPSRCS		= \
-		  xptcinvoke_pa32.cpp \
-		  xptcstubs_pa32.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcstubs_asm_pa32.s \
-		  xptcinvoke_asm_pa32.s \
-		  $(NULL)
+CPPSRCS		= xptcinvoke_pa32.cpp xptcstubs_pa32.cpp
+ASFILES		= xptcstubs_asm_pa32.s xptcinvoke_asm_pa32.s
 endif
 endif
 
-# AIX/PPC
-ifeq ($(OS_ARCH),AIX)
-CPPSRCS		= \
-		  xptcinvoke_ppc_aix.cpp \
-		  xptcstubs_ppc_aix.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcinvoke_asm_ppc_aix.s \
-		  xptcstubs_asm_ppc_aix.s \
-		  $(NULL)
-endif
-
-ifeq ($(OS_ARCH),NetBSD)
+######################################################################
+# M68k
+######################################################################
+#
 # NetBSD/m68k
+#
+ifeq ($(OS_ARCH),NetBSD)
 ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
-CPPSRCS		= \
-		  xptcinvoke_netbsd_m68k.cpp \
-		  xptcstubs_netbsd_m68k.cpp \
-		  $(NULL)
+CPPSRCS		= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
 endif
-# NetBSD/ARM
-#ifneq (,$(filter arm32 armv4l sa110,$(OS_TEST)))
-#CPPSRCS		= \
-#		  xptcinvoke_arm.cpp \
-#		  xptcstubs_arm.cpp \
-#		  $(NULL)
-#endif
 endif
 
-# IRIX
+######################################################################
+# MIPS
+######################################################################
+#
+# IRIX/MIPS
+#
 ifeq ($(OS_ARCH),IRIX)
 ifneq ($(basename $(OS_RELEASE)),5)
-CPPSRCS		= \
-		  xptcinvoke_irix.cpp \
-		  xptcstubs_irix.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcinvoke_asm_irix.s \
-		  xptcstubs_asm_irix.s \
-		  $(NULL)
+CPPSRCS		= xptcinvoke_irix.cpp xptcstubs_irix.cpp
+ASFILES		= xptcinvoke_asm_irix.s xptcstubs_asm_irix.s
 endif
 endif
 
-# OpenVMS (Alpha only at this point)
-ifeq ($(OS_ARCH),OpenVMS)
-ifeq ($(CPU_ARCH),Alpha)
-CPPSRCS		= \
-		  xptcinvoke_openvms_alpha.cpp \
-		  xptcstubs_openvms_alpha.cpp \
-		  $(NULL)
-ASFILES		= \
-		  xptcinvoke_asm_openvms_alpha.s \
-		  xptcstubs_asm_openvms_alpha.s \
-		  $(NULL)
+######################################################################
+# PowerPC
+######################################################################
+#
+# AIX/PPC
+#
+ifeq ($(OS_ARCH),AIX)
+CPPSRCS		= xptcinvoke_ppc_aix.cpp xptcstubs_ppc_aix.cpp
+ASFILES		= xptcinvoke_asm_ppc_aix.s xptcstubs_asm_ppc_aix.s
+endif
+
+######################################################################
+# SPARC
+######################################################################
+#
+# Linux/SPARC
+#
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxsparc)
+CPPSRCS		= xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp
+ASFILES		= xptcinvoke_asm_sparc_linux.s xptcstubs_asm_sparc_solaris.s
+endif
+#
+# Solaris/SPARC
+#
+ifeq ($(OS_ARCH),SunOS)
+ifneq (86,$(findstring 86,$(OS_TEST)))
+CPPSRCS		= xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp
+ASFILES		= xptcinvoke_asm_sparc_solaris_GCC.s xptcstubs_asm_sparc_solaris.s
 endif
 endif
 
@@ -197,7 +185,6 @@ xptcstubs_asm_irix.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_i
 	@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; else true; fi
 endif
 
-
 ifeq ($(OS_ARCH),OpenVMS)
 # Our assembler wants the include file to be of assembler syntax, not C/C++
 # syntax, so we have to massage it slightly.
@@ -219,3 +206,4 @@ xptcstubs_asm_openvms_alpha.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_as
 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(srcdir)/xptcstubs_asm_openvms_alpha.s
 	@rm -f $$HOME/xptcstubsdef_asm.vms
 endif
+
diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
index 304843e9ec7..4e5f6bedf68 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -40,3 +40,4 @@ CFLAGS		+= -DJS_THREADSAFE
 ifeq ($(OS_ARCH),BSD_OS)
 OS_LIBS		+= -lgcc
 endif
+
diff --git a/mozilla/xpcom/reflect/xptinfo/Makefile.in b/mozilla/xpcom/reflect/xptinfo/Makefile.in
index a2d215b0421..066c396c9ee 100644
--- a/mozilla/xpcom/reflect/xptinfo/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/Makefile.in
@@ -1,3 +1,4 @@
+#
 # 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
@@ -12,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,3 +29,4 @@ DIRS		+= tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptinfo/public/Makefile.in b/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
index a23d97a8545..c4daee5a2ec 100644
--- a/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/public/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,23 +13,26 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-MODULE		= xpcom
 
 include $(DEPTH)/config/autoconf.mk
 
-CFLAGS	+= -DEXPORT_XPCI_API
+MODULE		= xpcom
 
 EXPORTS		= \
-		  xptinfo.h \
-		  nsIInterfaceInfoManager.h \
-		  nsIInterfaceInfo.h \
-		  $(NULL)
+		xptinfo.h \
+		nsIInterfaceInfoManager.h \
+		nsIInterfaceInfo.h \
+		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
+CFLAGS		+= -DEXPORT_XPCI_API
+
diff --git a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in
index ce8bc746b6d..447dd3eccf8 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -24,20 +25,18 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 LIBRARY_NAME	= xptinfo
 
-CSRCS		= $(NULL)
-
-CPPSRCS		= nsInterfaceInfo.cpp           \
-		  nsInterfaceInfoManager.cpp	\
-		  nsTypelibRecord.cpp		\
-		  nsInterfaceRecord.cpp		\
-		  $(NULL)
-
 REQUIRES	= xpcom
 
+CPPSRCS		= \
+		nsInterfaceInfo.cpp \
+		nsInterfaceInfoManager.cpp \
+		nsTypelibRecord.cpp \
+		nsInterfaceRecord.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-# export:: libs
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
index 26f94b2ef93..00d48ae3861 100644
--- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -33,12 +33,12 @@ LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo
 endif
 
 LIBS		= \
-		  -L$(DIST)/bin \
-		  -L$(DIST)/lib \
-		  -lxpcom \
-		  $(LOST_SYM_LIBS) \
-		  $(NSPR_LIBS) \
-		  $(NULL)
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		$(LOST_SYM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in
index 47039bad7f2..c650559907e 100644
--- a/mozilla/xpcom/sample/Makefile.in
+++ b/mozilla/xpcom/sample/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -21,20 +22,18 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = sample
-LIBRARY_NAME = sample
-IS_COMPONENT = 1
+MODULE		= sample
+LIBRARY_NAME	= sample
+IS_COMPONENT	= 1
 
-XPIDLSRCS = \
-	nsISample.idl		\
-	$(NULL)
+REQUIRES	= sample raptor xpcom
 
-CPPSRCS = \
-	nsSample.cpp		\
-	nsSampleFactory.cpp	\
-	$(NULL)
+CPPSRCS		= \
+		nsSample.cpp \
+		nsSampleFactory.cpp \
+		$(NULL)
 
-REQUIRES = sample raptor xpcom
+XPIDLSRCS	= nsISample.idl
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index 2c7b9f36e99..4dcc1483e7c 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -45,8 +45,6 @@ CPPSRCS		= \
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-EXPORT_RESOURCE	= $(srcdir)/test.properties
-
 ifdef NO_LD_ARCHIVE_FLAGS
 LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo
 endif
@@ -82,5 +80,5 @@ DEFINES		+= -DUSE_NSREG
 INCLUDES	+= -I$(srcdir)/../public
 
 install::
-	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
+	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
 
diff --git a/mozilla/xpcom/tests/dynamic/Makefile.in b/mozilla/xpcom/tests/dynamic/Makefile.in
index 59093b73bfc..419b18528db 100644
--- a/mozilla/xpcom/tests/dynamic/Makefile.in
+++ b/mozilla/xpcom/tests/dynamic/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,22 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = testdynamic
+LIBRARY_NAME	= testdynamic
 
-LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
+CPPSRCS		= TestDynamic.cpp
 
-CPPSRCS = \
-	TestDynamic.cpp	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LOCAL_INCLUDES	= -I$(srcdir)/.. -I$(srcdir)/../../public
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/tests/services/Makefile.in b/mozilla/xpcom/tests/services/Makefile.in
index 5f222548b0a..0f81a7a1302 100644
--- a/mozilla/xpcom/tests/services/Makefile.in
+++ b/mozilla/xpcom/tests/services/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,22 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = MyService
+LIBRARY_NAME	= MyService
 
-LOCAL_INCLUDES = -I$(srcdir)/..
+CPPSRCS		= MyService.cpp
 
-CPPSRCS = \
-	MyService.cpp	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LOCAL_INCLUDES	= -I$(srcdir)/..
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in
index a71cf62aa68..936f7c6f58b 100644
--- a/mozilla/xpcom/threads/Makefile.in
+++ b/mozilla/xpcom/threads/Makefile.in
@@ -1,4 +1,3 @@
-#!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
@@ -14,48 +13,42 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom
+LIBRARY_NAME	= xpcomthreads_s
 
-LIBRARY_NAME = xpcomthreads_s
+REQUIRES	= xpcom
 
-MODULE = xpcom
+CPPSRCS		= \
+		nsAutoLock.cpp \
+		nsEventQueue.cpp \
+		nsEventQueueService.cpp \
+		nsThread.cpp \
+		$(NULL)
 
-XPIDLSRCS =		  \
-	nsIThread.idl	  \
-        nsIThreadPool.idl \
-        nsIRunnable.idl	  \
-	$(NULL)
+EXPORTS		= \
+		nsAutoLock.h \
+		nsIEventQueue.h \
+		nsIEventQueueService.h \
+		$(NULL)			
 
-CPPSRCS =				\
-	nsAutoLock.cpp		        \
-	nsEventQueue.cpp		\
-	nsEventQueueService.cpp		\
-	nsThread.cpp			\
-	$(NULL)
+XPIDLSRCS	= \
+		nsIThread.idl \
+		nsIThreadPool.idl \
+		nsIRunnable.idl \
+		$(NULL)
 
-EXPORTS = \
-	nsAutoLock.h           \
-	nsIEventQueue.h        \
-	nsIEventQueueService.h \
-	$(NULL)			
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-LOCAL_INCLUDES = -I$(srcdir)/../components
-
-DEFINES +=  -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-REQUIRES = xpcom
-
-MKSHLIB :=
+LOCAL_INCLUDES	= -I$(srcdir)/../components
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -63,3 +56,5 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
diff --git a/mozilla/xpcom/tools/Makefile.in b/mozilla/xpcom/tools/Makefile.in
index c405c108bb0..85b21294561 100644
--- a/mozilla/xpcom/tools/Makefile.in
+++ b/mozilla/xpcom/tools/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = registry
+DIRS		= registry
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in
index 3ac675e7476..19422df83d6 100644
--- a/mozilla/xpcom/tools/registry/Makefile.in
+++ b/mozilla/xpcom/tools/registry/Makefile.in
@@ -41,3 +41,4 @@ LIBS		+= \
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
+
diff --git a/mozilla/xpcom/typelib/Makefile.in b/mozilla/xpcom/typelib/Makefile.in
index 0af677d6ae7..d7ebf01edad 100644
--- a/mozilla/xpcom/typelib/Makefile.in
+++ b/mozilla/xpcom/typelib/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,21 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-#
-# xpt needs to be build before xpidl
-#
-DIRS = xpt xpidl
-
-#ifdef ENABLE_TESTS
-#DIRS += tests
-#endif
+DIRS		= xpt xpidl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/typelib/xpidl/Makefile.in b/mozilla/xpcom/typelib/xpidl/Makefile.in
index f6220dc138f..a2002bb62a6 100644
--- a/mozilla/xpcom/typelib/xpidl/Makefile.in
+++ b/mozilla/xpcom/typelib/xpidl/Makefile.in
@@ -13,52 +13,51 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
-
-PROGRAM = xpidl
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS = \
-	xpidl.c \
-	xpidl_idl.c \
-	xpidl_header.c \
-	xpidl_typelib.c \
-	xpidl_doc.c \
-	xpidl_java.c \
-	$(NULL)
+PROGRAM		= xpidl
+INTERNAL_TOOLS	= 1
+
+CSRCS		= \
+		xpidl.c \
+		xpidl_idl.c \
+		xpidl_header.c \
+		xpidl_typelib.c \
+		xpidl_doc.c \
+		xpidl_java.c \
+		$(NULL)
 
 # Compile directly against the static lib, so we can use xpidl during the build
 # without the shared library path being set.
 ifdef CROSS_COMPILE
-LIBS = $(DIST)/lib/libhostxpt.a $(LIBIDL_LIBS)
+LIBS		= $(DIST)/lib/libhostxpt.a $(LIBIDL_LIBS)
 else
-LIBS = $(DIST)/lib/libxpt.a $(LIBIDL_LIBS)
+LIBS		= $(DIST)/lib/libxpt.a $(LIBIDL_LIBS)
 endif
 
-# We are building a build tool
-INTERNAL_TOOLS = 1
-
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS += $(LIBIDL_CFLAGS)
+CFLAGS		+= $(LIBIDL_CFLAGS)
 
 ifdef CROSS_COMPILE
 ifdef HOST_NSPR_MDCPUCFG
-CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
+CFLAGS		+= -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
 endif
 endif
 
 # Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
 ifdef CROSS_COMPILE
-EXTRA_DEPS = $(wildcard $(DIST)/lib/libhostxpt.*)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/libhostxpt.*)
 else
-EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/libxpt.*)
 endif
-# Build xpidl early.
+
 export:: install
 
diff --git a/mozilla/xpcom/typelib/xpt/Makefile.in b/mozilla/xpcom/typelib/xpt/Makefile.in
index cce6935ba40..c4a0d9f7da8 100644
--- a/mozilla/xpcom/typelib/xpt/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,20 +13,22 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src
+DIRS		= public src
 
 ifdef ENABLE_TESTS
-DIRS    += tests
+DIRS		+= tests
 endif
 
-DIRS	+= tools
+DIRS		+= tools
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/typelib/xpt/public/Makefile.in b/mozilla/xpcom/typelib/xpt/public/Makefile.in
index 98af22947c9..683077222e5 100644
--- a/mozilla/xpcom/typelib/xpt/public/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/public/Makefile.in
@@ -1,4 +1,4 @@
-#!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
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -23,10 +24,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 
-EXPORTS		= xpt_struct.h		\
-		  xpt_xdr.h		\
-		  $(NULL)
-
+EXPORTS		= xpt_struct.h xpt_xdr.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/typelib/xpt/src/Makefile.in b/mozilla/xpcom/typelib/xpt/src/Makefile.in
index b065028cc96..2bcea10de47 100644
--- a/mozilla/xpcom/typelib/xpt/src/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/src/Makefile.in
@@ -24,33 +24,28 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpt
-
 LIB_IS_C_ONLY	= 1
 
-CSRCS		= xpt_struct.c 	\
-		  xpt_xdr.c	\
-		  $(NULL)
+REQUIRES	= $(MODULE)
+
+CSRCS		= xpt_struct.c xpt_xdr.c
 
 ifdef CROSS_COMPILE
 HOSTOBJS	:= $(CSRCS:.c=.o-h)
 endif
 
-REQUIRES	= $(MODULE)
-
-EXPORTS = $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-# build libxpt early so that it'll be available to xpidl, which also
+include $(topsrcdir)/config/rules.mk
+
+# Build libxpt early so that it'll be available to xpidl, which also
 # must be built early.
 export:: libs
 
-include $(topsrcdir)/config/rules.mk
-
 ifdef CROSS_COMPILE
-GARBAGE += libhostxpt.$(LIB_SUFFIX) $(HOSTOBJS)
+GARBAGE		+= libhostxpt.$(LIB_SUFFIX) $(HOSTOBJS)
 
 libhostxpt.$(LIB_SUFFIX): $(HOSTOBJS)
 	rm -f $@
diff --git a/mozilla/xpcom/typelib/xpt/tests/Makefile.in b/mozilla/xpcom/typelib/xpt/tests/Makefile.in
index 10e9a49d8b6..ac0b9fbc314 100644
--- a/mozilla/xpcom/typelib/xpt/tests/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/tests/Makefile.in
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -22,19 +23,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
+CPP_PROG_LINK	= 1
 
 SIMPLE_PROGRAMS	= PrimitiveTest SimpleTypeLib
 
 CSRCS		= PrimitiveTest.c SimpleTypeLib.c
 
-# This fixes cout & ostream undefines for gcc 2.7.2.3.
-CPP_PROG_LINK = 1
-
-LIBS		= 		\
-		  -L$(DIST)/bin \
-		  -lxpcom 	\
-		  $(NSPR_LIBS)	\
-		  $(NULL)
+LIBS		= -L$(DIST)/bin -lxpcom $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/typelib/xpt/tools/Makefile.in b/mozilla/xpcom/typelib/xpt/tools/Makefile.in
index d23631f32c4..8633cd5fca6 100644
--- a/mozilla/xpcom/typelib/xpt/tools/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/tools/Makefile.in
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -22,6 +23,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
+INTERNAL_TOOLS	= 1
 
 SIMPLE_PROGRAMS	= xpt_dump xpt_link
 
@@ -38,21 +40,19 @@ endif
 # Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled
 # when libxpt changes.
 ifdef CROSS_COMPILE
-EXTRA_DEPS = $(wildcard $(DIST)/lib/libhostxpt.*)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/libhostxpt.*)
 else
-EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
+EXTRA_DEPS	= $(wildcard $(DIST)/lib/libxpt.*)
 endif
 
-# Build xpt_link and xpt_dump early.  (libs creates .deps used by install.)
-export:: libs install
-
-# We are building a build tool
-INTERNAL_TOOLS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef CROSS_COMPILE
 ifdef HOST_NSPR_MDCPUCFG
-CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
+CFLAGS		+= -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
 endif
 endif
+
+# Build xpt_link and xpt_dump early.  (libs creates .deps used by install.)
+export:: libs install
+