diff --git a/mozilla/xpfe/AppCores/Makefile.in b/mozilla/xpfe/AppCores/Makefile.in
index d2a87f1659d..c93fbbda704 100644
--- a/mozilla/xpfe/AppCores/Makefile.in
+++ b/mozilla/xpfe/AppCores/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,16 +13,16 @@
 # 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
 
-DIRS = public src xul idl
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src xul idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/AppCores/idl/Makefile.in b/mozilla/xpfe/AppCores/idl/Makefile.in
index 92a6d2d4ce1..8c1fae18538 100644
--- a/mozilla/xpfe/AppCores/idl/Makefile.in
+++ b/mozilla/xpfe/AppCores/idl/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,19 +13,18 @@
 # 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@
-MODULE=appcores
 
 include $(DEPTH)/config/autoconf.mk
 
-XPIDLSRCS =	\
-	nsIDOMBaseAppCore.idl	\
-	$(NULL)
+MODULE		= appcores
 
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsIDOMBaseAppCore.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/AppCores/public/Makefile.in b/mozilla/xpfe/AppCores/public/Makefile.in
index c95758c9b22..39fedc6c8e0 100644
--- a/mozilla/xpfe/AppCores/public/Makefile.in
+++ b/mozilla/xpfe/AppCores/public/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,27 +13,25 @@
 # 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
 
-EXPORTS =                       \
+EXPORTS		= \
 		nsIDOMAppCoresManager.h \
-		nsIDOMBaseAppCore.h     \
-		nsIDOMProfileCore.h     \
-		nsIDOMToolkitCore.h		\
-		nsIDOMBrowserAppCore.h  \
-		nsAppCoresCIDs.h        \
+		nsIDOMBaseAppCore.h \
+		nsIDOMProfileCore.h \
+		nsIDOMToolkitCore.h \
+		nsIDOMBrowserAppCore.h \
+		nsAppCoresCIDs.h \
 		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
-
-
diff --git a/mozilla/xpfe/AppCores/src/Makefile.in b/mozilla/xpfe/AppCores/src/Makefile.in
index 71f199d35df..39743dee333 100644
--- a/mozilla/xpfe/AppCores/src/Makefile.in
+++ b/mozilla/xpfe/AppCores/src/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,44 +13,38 @@
 # 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
 
-REQUIRES = txtsvc
+MODULE		= raptor
+LIBRARY_NAME	= appcores
 
-LIBRARY_NAME = appcores
-# This is no longer a component because the mailnew app links with it.
-# Since appcores are supposed to be going away, we are going to put
-# this back in the bin/ directory
-#IS_COMPONENT = 1
-MODULE=raptor
+REQUIRES	= txtsvc
 
-CPPSRCS= \
-	nsBaseAppCore.cpp       \
-	nsProfileCore.cpp       \
-	nsAppCoresNameSet.cpp       \
-	nsToolkitCore.cpp	\
-	nsProfileCoreFactory.cpp       \
-	nsToolkitCoreFactory.cpp	\
-	nsAppCoresManager.cpp       \
-	nsAppCoresManagerFactory.cpp       \
-	nsJSBaseAppCore.cpp       \
-	nsJSAppCoresManager.cpp       \
-	nsJSProfileCore.cpp   \
-	nsJSToolkitCore.cpp     \
-	nsJSBrowserAppCore.cpp   \
-	nsAppCores.cpp         \
-	$(NULL)
+CPPSRCS		= \
+		nsBaseAppCore.cpp \
+		nsProfileCore.cpp \
+		nsAppCoresNameSet.cpp \
+		nsToolkitCore.cpp \
+		nsProfileCoreFactory.cpp \
+		nsToolkitCoreFactory.cpp \
+		nsAppCoresManager.cpp \
+		nsAppCoresManagerFactory.cpp \
+		nsJSBaseAppCore.cpp \
+		nsJSAppCoresManager.cpp \
+		nsJSProfileCore.cpp \
+		nsJSToolkitCore.cpp \
+		nsJSBrowserAppCore.cpp \
+		nsAppCores.cpp \
+		$(NULL)
 
-EXTRA_DSO_LDOPTS =\
-			-L$(DIST)/bin \
-			-ljsdom \
-			$(NULL)
+EXTRA_DSO_LDOPTS = -L$(DIST)/bin -ljsdom
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/AppCores/xul/Makefile.in b/mozilla/xpfe/AppCores/xul/Makefile.in
index e9cb992c099..5233de76137 100644
--- a/mozilla/xpfe/AppCores/xul/Makefile.in
+++ b/mozilla/xpfe/AppCores/xul/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,93 +13,92 @@
 # 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
-include $(topsrcdir)/config/rules.mk
 
 EXPORT_RESOURCE_TOOLBAR = \
-	$(srcdir)/resources/Mail_Forward.gif \
-	$(srcdir)/resources/Mail_GetMsg.gif \
-	$(srcdir)/resources/Mail_NewMsg.gif \
-	$(srcdir)/resources/Mail_Reply.gif \
-	$(srcdir)/resources/Mail_SendMsg.gif \
-	$(srcdir)/resources/DialogAddrIcon.gif \
-	$(srcdir)/resources/DialogAddrIcon_mo.gif \
-	$(srcdir)/resources/DialogCompIcon.gif \
-	$(srcdir)/resources/DialogCompIcon_mo.gif \
-	$(srcdir)/resources/DialogMailIcon.gif \
-	$(srcdir)/resources/DialogMailIcon_mo.gif \
-	$(srcdir)/resources/DialogNavIcon.gif \
-	$(srcdir)/resources/DialogNavIcon_mo.gif \
-	$(srcdir)/resources/TB_Back.gif \
-	$(srcdir)/resources/TB_Back_dis.gif \
-	$(srcdir)/resources/TB_Back_mo.gif \
-	$(srcdir)/resources/TB_Bookmarks.gif \
-	$(srcdir)/resources/TB_Bookmarks_mo.gif \
-	$(srcdir)/resources/TB_Edit.gif \
-	$(srcdir)/resources/TB_Forward.gif \
-	$(srcdir)/resources/TB_Forward_dis.gif \
-	$(srcdir)/resources/TB_Forward_mo.gif \
-	$(srcdir)/resources/TB_Home.gif \
-	$(srcdir)/resources/TB_Home_mo.gif \
-	$(srcdir)/resources/TB_HTab.gif \
-	$(srcdir)/resources/TB_HTab_mo.gif \
-	$(srcdir)/resources/TB_LoadImages.gif \
-	$(srcdir)/resources/TB_Location.gif \
-	$(srcdir)/resources/TB_Location_mo.gif \
-	$(srcdir)/resources/TB_MiniAddr.gif \
-	$(srcdir)/resources/TB_MiniComp.gif \
-	$(srcdir)/resources/TB_MiniMail.gif \
-	$(srcdir)/resources/TB_MiniNav.gif \
-	$(srcdir)/resources/TB_MiniTab.gif \
-	$(srcdir)/resources/TB_MixSecurity.gif \
-	$(srcdir)/resources/TB_Netscape.gif \
-	$(srcdir)/resources/TB_Netscape_mo.gif \
-	$(srcdir)/resources/TB_PersonalIcon.gif \
-	$(srcdir)/resources/TB_Places.gif \
-	$(srcdir)/resources/TB_Places_mo.gif \
-	$(srcdir)/resources/TB_popup.gif \
-	$(srcdir)/resources/TB_Print.gif \
-	$(srcdir)/resources/TB_Print_mo.gif \
-	$(srcdir)/resources/TB_Reload.gif \
-	$(srcdir)/resources/TB_Reload_mo.gif \
-	$(srcdir)/resources/TB_Search.gif \
-	$(srcdir)/resources/TB_Search_mo.gif \
-	$(srcdir)/resources/TB_Secure.gif \
-	$(srcdir)/resources/TB_Secure_mo.gif \
-	$(srcdir)/resources/TB_Stop.gif \
-	$(srcdir)/resources/TB_Stop_dis.gif \
-	$(srcdir)/resources/TB_Stop_mo.gif \
-	$(srcdir)/resources/TB_Tab.gif \
-	$(srcdir)/resources/TB_TabSmall.gif \
-	$(srcdir)/resources/TB_TabSmall_mo.gif \
-	$(srcdir)/resources/TB_Tab_mo.gif \
-	$(srcdir)/resources/TB_Unsecure.gif \
-	$(srcdir)/resources/TB_WhatsRelated.gif \
-	$(srcdir)/resources/TB_WhatsRelated_mo.gif \
-	$(srcdir)/resources/StatusBar-insecure.gif \
-	$(srcdir)/resources/StatusBar-secure.gif \
-	$(srcdir)/resources/TB_NewBack.gif \
-	$(srcdir)/resources/TB_NewForward.gif \
-	$(srcdir)/resources/TB_NewReload.gif \
-	$(srcdir)/resources/TB_NewStop.gif \
-	$(srcdir)/resources/TB_NewHome.gif \
-	$(srcdir)/resources/TB_NewPrint.gif \
-    $(srcdir)/resources/grippy-horizontal-before.gif \
-    $(srcdir)/resources/grippy-horizontal-after.gif \
-    $(srcdir)/resources/grippy-vertical-before.gif \
-    $(srcdir)/resources/grippy-vertical-after.gif \
-	$(NULL)
+		$(srcdir)/resources/Mail_Forward.gif \
+		$(srcdir)/resources/Mail_GetMsg.gif \
+		$(srcdir)/resources/Mail_NewMsg.gif \
+		$(srcdir)/resources/Mail_Reply.gif \
+		$(srcdir)/resources/Mail_SendMsg.gif \
+		$(srcdir)/resources/DialogAddrIcon.gif \
+		$(srcdir)/resources/DialogAddrIcon_mo.gif \
+		$(srcdir)/resources/DialogCompIcon.gif \
+		$(srcdir)/resources/DialogCompIcon_mo.gif \
+		$(srcdir)/resources/DialogMailIcon.gif \
+		$(srcdir)/resources/DialogMailIcon_mo.gif \
+		$(srcdir)/resources/DialogNavIcon.gif \
+		$(srcdir)/resources/DialogNavIcon_mo.gif \
+		$(srcdir)/resources/TB_Back.gif \
+		$(srcdir)/resources/TB_Back_dis.gif \
+		$(srcdir)/resources/TB_Back_mo.gif \
+		$(srcdir)/resources/TB_Bookmarks.gif \
+		$(srcdir)/resources/TB_Bookmarks_mo.gif \
+		$(srcdir)/resources/TB_Edit.gif \
+		$(srcdir)/resources/TB_Forward.gif \
+		$(srcdir)/resources/TB_Forward_dis.gif \
+		$(srcdir)/resources/TB_Forward_mo.gif \
+		$(srcdir)/resources/TB_Home.gif \
+		$(srcdir)/resources/TB_Home_mo.gif \
+		$(srcdir)/resources/TB_HTab.gif \
+		$(srcdir)/resources/TB_HTab_mo.gif \
+		$(srcdir)/resources/TB_LoadImages.gif \
+		$(srcdir)/resources/TB_Location.gif \
+		$(srcdir)/resources/TB_Location_mo.gif \
+		$(srcdir)/resources/TB_MiniAddr.gif \
+		$(srcdir)/resources/TB_MiniComp.gif \
+		$(srcdir)/resources/TB_MiniMail.gif \
+		$(srcdir)/resources/TB_MiniNav.gif \
+		$(srcdir)/resources/TB_MiniTab.gif \
+		$(srcdir)/resources/TB_MixSecurity.gif \
+		$(srcdir)/resources/TB_Netscape.gif \
+		$(srcdir)/resources/TB_Netscape_mo.gif \
+		$(srcdir)/resources/TB_PersonalIcon.gif \
+		$(srcdir)/resources/TB_Places.gif \
+		$(srcdir)/resources/TB_Places_mo.gif \
+		$(srcdir)/resources/TB_popup.gif \
+		$(srcdir)/resources/TB_Print.gif \
+		$(srcdir)/resources/TB_Print_mo.gif \
+		$(srcdir)/resources/TB_Reload.gif \
+		$(srcdir)/resources/TB_Reload_mo.gif \
+		$(srcdir)/resources/TB_Search.gif \
+		$(srcdir)/resources/TB_Search_mo.gif \
+		$(srcdir)/resources/TB_Secure.gif \
+		$(srcdir)/resources/TB_Secure_mo.gif \
+		$(srcdir)/resources/TB_Stop.gif \
+		$(srcdir)/resources/TB_Stop_dis.gif \
+		$(srcdir)/resources/TB_Stop_mo.gif \
+		$(srcdir)/resources/TB_Tab.gif \
+		$(srcdir)/resources/TB_TabSmall.gif \
+		$(srcdir)/resources/TB_TabSmall_mo.gif \
+		$(srcdir)/resources/TB_Tab_mo.gif \
+		$(srcdir)/resources/TB_Unsecure.gif \
+		$(srcdir)/resources/TB_WhatsRelated.gif \
+		$(srcdir)/resources/TB_WhatsRelated_mo.gif \
+		$(srcdir)/resources/StatusBar-insecure.gif \
+		$(srcdir)/resources/StatusBar-secure.gif \
+		$(srcdir)/resources/TB_NewBack.gif \
+		$(srcdir)/resources/TB_NewForward.gif \
+		$(srcdir)/resources/TB_NewReload.gif \
+		$(srcdir)/resources/TB_NewStop.gif \
+		$(srcdir)/resources/TB_NewHome.gif \
+		$(srcdir)/resources/TB_NewPrint.gif \
+		$(srcdir)/resources/grippy-horizontal-before.gif \
+		$(srcdir)/resources/grippy-horizontal-after.gif \
+		$(srcdir)/resources/grippy-vertical-before.gif \
+		$(srcdir)/resources/grippy-vertical-after.gif \
+		$(NULL)
 
-EXPORT_RESOURCE_THROBBER = \
-	$(srcdir)/resources/throbbingN.gif \
-	$(NULL)
+EXPORT_RESOURCE_THROBBER = $(srcdir)/resources/throbbingN.gif
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(DIST)/bin/res/toolbar
diff --git a/mozilla/xpfe/appshell/public/Makefile.in b/mozilla/xpfe/appshell/public/Makefile.in
index b46b81fd41d..59868b5185c 100644
--- a/mozilla/xpfe/appshell/public/Makefile.in
+++ b/mozilla/xpfe/appshell/public/Makefile.in
@@ -21,32 +21,31 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 
-XPIDL_MODULE=appshell
+XPIDL_MODULE	= appshell
 
-XPIDLSRCS =                       \
-	nsIFileLocator.idl        \
-	nsIAppShellService.idl    \
-	nsIWindowMediator.idl     \
-	nsICommonDialogs.idl  \
-	nsIDialogParamBlock.idl \
-	nsICmdLineService.idl	\
-	nsIQFAServices.idl \
-	$(NULL)
+EXPORTS		= \
+		nsIWebShellWindow.h \
+		nsAppShellCIDs.h \
+		nsBuildID.h \
+		nsIXULWindowCallbacks.h \
+		nsFileLocations.h \
+		nsIDOMXPConnectFactory.h \
+		nsINetSupportDialogService.h \
+		nsISessionHistory.h \
+		$(NULL)
 
-EXPORTS = \
-	nsIWebShellWindow.h	          \
-	nsAppShellCIDs.h		\
-	nsBuildID.h			\
-	nsIXULWindowCallbacks.h       \
-	nsFileLocations.h             \
-	nsIDOMXPConnectFactory.h      \
-	nsINetSupportDialogService.h  \
-	nsISessionHistory.h           \
-	$(NULL)
+XPIDLSRCS	= \
+		nsIFileLocator.idl \
+		nsIAppShellService.idl \
+		nsIWindowMediator.idl \
+		nsICommonDialogs.idl \
+		nsIDialogParamBlock.idl \
+		nsICmdLineService.idl \
+		nsIQFAServices.idl \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index b3f143d369e..1d4a9b758fe 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -23,23 +23,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= apprunner
-PROGRAM		= apprunner
+PROGRAM		= mozilla
 
 CPPSRCS		= \
 		nsAppRunner.cpp \
 		nsSetupRegistry.cpp \
 		$(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
-endif
-
-ifdef MOZ_OJI
-OJI_LIBS	= -ljsj
-endif
-
-
-
 XP_DIST_LIBS	= \
 		-lraptorgfx \
 		-lmozjs \
@@ -66,12 +56,20 @@ ifdef MOZ_MONOLITHIC_TOOLKIT
 XP_LIBS		+= $(TK_LIBS)
 endif
 
+ifdef MOZ_OJI
+OJI_LIBS	= -ljsj
+endif
+
 LIBS		= $(XP_LIBS)
 
-# cls/shaver are responsible for this amazingness
-EXTRA_DEPS	= $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
+EXTRA_DEPS	= \
+		$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
+		$(XP_NS_UNDERBAR_CRAP) \
+		$(NULL)
 
-EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
+endif
 
 include $(topsrcdir)/config/rules.mk
 
@@ -79,3 +77,4 @@ CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 install:: $(srcdir)/mozilla-apprunner.sh
 	$(INSTALL) $< $(DIST)/bin
+
diff --git a/mozilla/xpfe/browser/Makefile.in b/mozilla/xpfe/browser/Makefile.in
index 2bca2ab5b52..743016be2c4 100644
--- a/mozilla/xpfe/browser/Makefile.in
+++ b/mozilla/xpfe/browser/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,16 +13,16 @@
 # 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
 
-DIRS = public src samples resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src samples resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/browser/resources/Makefile.in b/mozilla/xpfe/browser/resources/Makefile.in
index f1d51552fb8..683de7f38b3 100644
--- a/mozilla/xpfe/browser/resources/Makefile.in
+++ b/mozilla/xpfe/browser/resources/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,17 +13,16 @@
 # 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
 
-DIRS = content skin locale
+DIRS		= content skin locale
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/mozilla/xpfe/browser/resources/content/Makefile.in b/mozilla/xpfe/browser/resources/content/Makefile.in
index ff3335ddd67..8e58f618f2b 100644
--- a/mozilla/xpfe/browser/resources/content/Makefile.in
+++ b/mozilla/xpfe/browser/resources/content/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/xpfe/browser/resources/locale/Makefile.in b/mozilla/xpfe/browser/resources/locale/Makefile.in
index 469ad0a16a8..40658a31f4e 100644
--- a/mozilla/xpfe/browser/resources/locale/Makefile.in
+++ b/mozilla/xpfe/browser/resources/locale/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,17 +13,16 @@
 # 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
 
-DIRS = en-US 
+DIRS		= en-US
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in
index d0036f79a48..98b9136e029 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/browser/resources/locale/en-US/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,25 +13,24 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+EXPORT_RESOURCE_CONTENT = \
+		$(srcdir)/navigator.dtd \
+		$(srcdir)/openLocation.dtd \
+		$(srcdir)/viewSource.dtd \
+		$(srcdir)/NetSupportConfirmCheckYN.dtd \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/navigator.dtd \
-	$(srcdir)/openLocation.dtd \
-	$(srcdir)/viewSource.dtd \
-	$(srcdir)/NetSupportConfirmCheckYN.dtd \
-	$(NULL)
-
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/navigator/locale/en-US
 
diff --git a/mozilla/xpfe/browser/resources/skin/Makefile.in b/mozilla/xpfe/browser/resources/skin/Makefile.in
index 79f57311997..7b3fd3f161b 100644
--- a/mozilla/xpfe/browser/resources/skin/Makefile.in
+++ b/mozilla/xpfe/browser/resources/skin/Makefile.in
@@ -17,22 +17,23 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/alertl.gif \
-	$(srcdir)/errorl.gif \
-	$(srcdir)/messagel.gif \
-	$(srcdir)/navigator.css \
-	$(srcdir)/questionl.gif \
-	$(srcdir)/contentframe.css \
-	$(srcdir)/animthrob.gif \
-	$(srcdir)/animthrob_single.gif \
-	$(NULL)
+		$(srcdir)/alertl.gif \
+		$(srcdir)/errorl.gif \
+		$(srcdir)/messagel.gif \
+		$(srcdir)/navigator.css \
+		$(srcdir)/questionl.gif \
+		$(srcdir)/contentframe.css \
+		$(srcdir)/animthrob.gif \
+		$(srcdir)/animthrob_single.gif \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/navigator/skin/default
diff --git a/mozilla/xpfe/browser/samples/Makefile.in b/mozilla/xpfe/browser/samples/Makefile.in
index 9ea2b3bf210..c9fe364e3bc 100644
--- a/mozilla/xpfe/browser/samples/Makefile.in
+++ b/mozilla/xpfe/browser/samples/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,32 +13,34 @@
 # 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@
-DIRS		= sampleimages
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/config/rules.mk
+
+DIRS		= sampleimages
 
 EXPORT_RESOURCE_SAMPLES = \
-        $(srcdir)/colorpicker.xul \
-	$(srcdir)/dexanimmaster.xul \
-	$(srcdir)/dexanimdialog.xul \
-	$(srcdir)/dexparammaster.xul \
-	$(srcdir)/dexparamdialog.xul \
-	$(srcdir)/dexparamdialog.html \
-	$(srcdir)/dexsimplemaster.xul \
-	$(srcdir)/dexsimpledialog.xul \
-	$(srcdir)/dexopenchrome.xul \
-	$(srcdir)/hidetoolicon.xul \
-	$(srcdir)/hidetoolicon.css \
-	$(srcdir)/tab.xul \
-        $(srcdir)/xpmenu.xul \
-        $(NULL)
+		$(srcdir)/colorpicker.xul \
+		$(srcdir)/dexanimmaster.xul \
+		$(srcdir)/dexanimdialog.xul \
+		$(srcdir)/dexparammaster.xul \
+		$(srcdir)/dexparamdialog.xul \
+		$(srcdir)/dexparamdialog.html \
+		$(srcdir)/dexsimplemaster.xul \
+		$(srcdir)/dexsimpledialog.xul \
+		$(srcdir)/dexopenchrome.xul \
+		$(srcdir)/hidetoolicon.xul \
+		$(srcdir)/hidetoolicon.css \
+		$(srcdir)/tab.xul \
+		$(srcdir)/xpmenu.xul \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
diff --git a/mozilla/xpfe/browser/samples/sampleimages/Makefile.in b/mozilla/xpfe/browser/samples/sampleimages/Makefile.in
index 82919a4c481..a6a888c6fbe 100644
--- a/mozilla/xpfe/browser/samples/sampleimages/Makefile.in
+++ b/mozilla/xpfe/browser/samples/sampleimages/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,23 +13,24 @@
 # 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
-include $(topsrcdir)/config/rules.mk
 
 EXPORT_RESOURCE_SAMPLES = \
-	$(srcdir)/right.gif \
-	$(srcdir)/down.gif \
-	$(srcdir)/left.gif \
-	$(srcdir)/up.gif \
-	$(srcdir)/bongo.gif \
-	$(NULL)
+		$(srcdir)/right.gif \
+		$(srcdir)/down.gif \
+		$(srcdir)/left.gif \
+		$(srcdir)/up.gif \
+		$(srcdir)/bongo.gif \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples/sampleimages
diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in
index bb618e6d83c..e3bb89050c0 100644
--- a/mozilla/xpfe/browser/src/Makefile.in
+++ b/mozilla/xpfe/browser/src/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,8 +13,9 @@
 # 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@
@@ -26,9 +26,7 @@ MODULE		= mozbrwsr
 LIBRARY_NAME	= mozbrwsr
 IS_COMPONENT	= 1
 
-CPPSRCS		= \
-		nsBrowserInstance.cpp \
-		$(NULL)
+CPPSRCS		= nsBrowserInstance.cpp
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in
index cfe07e44035..e4680877c2a 100644
--- a/mozilla/xpfe/components/Makefile.in
+++ b/mozilla/xpfe/components/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,16 +13,16 @@
 # 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
 
-DIRS = public bookmarks directory find history search sidebar related ucth xfer prefwindow
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public bookmarks directory find history search sidebar related ucth xfer prefwindow
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/bookmarks/Makefile.in b/mozilla/xpfe/components/bookmarks/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/bookmarks/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/bookmarks/public/Makefile.in b/mozilla/xpfe/components/bookmarks/public/Makefile.in
index 12ca9d44764..b8a9e5ee0b7 100644
--- a/mozilla/xpfe/components/bookmarks/public/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/public/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,19 +13,18 @@
 # 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
 
-MODULE=bookmarks
+MODULE		= bookmarks
 
-XPIDLSRCS	= nsIBookmarksService.idl	\
-		  $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+XPIDLSRCS	= nsIBookmarksService.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/bookmarks/resources/Makefile.in b/mozilla/xpfe/components/bookmarks/resources/Makefile.in
index 6ff2d3ee0cd..74981008482 100644
--- a/mozilla/xpfe/components/bookmarks/resources/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/resources/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,43 +13,45 @@
 # 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@
 
-CHROME_DIR          = bookmarks
-CHROME_CONTENT_DIR  = content/default
-CHROME_SKIN_DIR     = skin/default
-CHROME_SOURCE_DIR	= $(srcdir)
-
-CHROME_CONTENT = \
-	bm-panel.xul \
-	bm-props.xul \
-	bm-props.js \
-	bookmark-popup.js \
-	bookmarks.html \
-	bookmarks.js \
-	bookmarks.xul \
-	$(NULL)
-
-CHROME_SKIN = \
-	bookmark-folder-closed.gif \
-	bookmark-folder-open.gif \
-	bookmark-item.gif \
-	bookmarks.css \
-	iefavorite.gif \
-	manage-bookmarks.css \
-	personal-folder-closed.gif \
-	personal-folder-open.gif \
-	$(NULL)
-
-CHROME_L10N = \
-	locale/en-US/bm-props.dtd \
-	locale/en-US/bookmarks.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= bookmarks
+CHROME_CONTENT_DIR = content/default
+CHROME_SKIN_DIR	= skin/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		bm-panel.xul \
+		bm-props.xul \
+		bm-props.js \
+		bookmark-popup.js \
+		bookmarks.html \
+		bookmarks.js \
+		bookmarks.xul \
+		$(NULL)
+
+CHROME_SKIN	= \
+		bookmark-folder-closed.gif \
+		bookmark-folder-open.gif \
+		bookmark-item.gif \
+		bookmarks.css \
+		iefavorite.gif \
+		manage-bookmarks.css \
+		personal-folder-closed.gif \
+		personal-folder-open.gif \
+		$(NULL)
+
+CHROME_L10N	= \
+		locale/en-US/bm-props.dtd \
+		locale/en-US/bookmarks.dtd \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in
index b3178fc6077..23682e64b66 100644
--- a/mozilla/xpfe/components/bookmarks/src/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in
@@ -30,11 +30,11 @@ CPPSRCS		= nsBookmarksService.cpp
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_NECKO_UTIL_LIBS) \
-		$(MOZ_TIMER_LIBS)	\
-		-L$(DIST)/bin	\
-		-lxpcom		\
-		-lmozjs		\
-		$(NSPR_LIBS)	\
+		$(MOZ_TIMER_LIBS) \
+		-L$(DIST)/bin \
+		-lxpcom \
+		-lmozjs \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in
index 5526df5fc36..4cfc188b087 100644
--- a/mozilla/xpfe/components/directory/Makefile.in
+++ b/mozilla/xpfe/components/directory/Makefile.in
@@ -30,23 +30,19 @@ XPIDLSRCS	= nsIHTTPIndex.idl
 
 CPPSRCS		= nsDirectoryViewer.cpp
 
-CHROME_DIR		= directory
-CHROME_CONTENT_DIR	= content/default
-CHROME_SKIN_DIR		= skin/default
-CHROME_SOURCE_DIR	= $(srcdir)
+CHROME_DIR	= directory
+CHROME_CONTENT_DIR = content/default
+CHROME_SKIN_DIR	= skin/default
+CHROME_SOURCE_DIR = $(srcdir)
 
 CHROME_CONTENT	= \
-		directory.xul	\
-		directory.js	\
+		directory.xul \
+		directory.js \
 		$(NULL)
 
-CHROME_SKIN	= \
-		directory.css	\
-		$(NULL)
+CHROME_SKIN	= directory.css
 
-CHROME_L10N	= \
-		./locale/en-US/directory.dtd	\
-		$(NULL)
+CHROME_L10N	= ./locale/en-US/directory.dtd
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_NECKO_UTIL_LIBS) \
@@ -56,3 +52,4 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/find/Makefile.in b/mozilla/xpfe/components/find/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/find/Makefile.in
+++ b/mozilla/xpfe/components/find/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/find/public/Makefile.in b/mozilla/xpfe/components/find/public/Makefile.in
index 6ae3d9944ae..7e4f4ce9911 100644
--- a/mozilla/xpfe/components/find/public/Makefile.in
+++ b/mozilla/xpfe/components/find/public/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,25 +13,21 @@
 # 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
 
-EXPORTS =				\
+XPIDL_MODULE	= mozfind
+
+XPIDLSRCS	= \
+		nsIFindComponent.idl \
+		nsISearchContext.idl \
 		$(NULL)
 
-XPIDL_MODULE=mozfind
-
-XPIDLSRCS=\
-    nsIFindComponent.idl \
-    nsISearchContext.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/find/resources/Makefile.in b/mozilla/xpfe/components/find/resources/Makefile.in
index 45ca13e3694..3fa39ad9b84 100644
--- a/mozilla/xpfe/components/find/resources/Makefile.in
+++ b/mozilla/xpfe/components/find/resources/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,28 +13,25 @@
 # 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@
 
-CHROME_DIR = global
+include $(DEPTH)/config/autoconf.mk
 
-CHROME_SOURCE_DIR  = $(srcdir)
+CHROME_DIR	= global
+CHROME_SOURCE_DIR = $(srcdir)
 CHROME_CONTENT_DIR = content/default
 
-CHROME_CONTENT = \
-	finddialog.xul \
-	finddialog.js  \
-	$(NULL)
+CHROME_CONTENT	= \
+		finddialog.xul \
+		finddialog.js \
+		$(NULL)
 
-CHROME_SKIN = 
+CHROME_L10N	= ./locale/en-US/finddialog.dtd
 
-CHROME_L10N = \
-	./locale/en-US/finddialog.dtd \
-	$(NULL)
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/history/Makefile.in b/mozilla/xpfe/components/history/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/history/Makefile.in
+++ b/mozilla/xpfe/components/history/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/history/public/Makefile.in b/mozilla/xpfe/components/history/public/Makefile.in
index 5712ca0e262..92ced9714dd 100644
--- a/mozilla/xpfe/components/history/public/Makefile.in
+++ b/mozilla/xpfe/components/history/public/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,19 +13,18 @@
 # 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
 
-MODULE=history
+MODULE		= history
 
-XPIDLSRCS	= nsIGlobalHistory.idl	\
-		  $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+XPIDLSRCS	= nsIGlobalHistory.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/history/resources/Makefile.in b/mozilla/xpfe/components/history/resources/Makefile.in
index bd075f299b8..178e8882e08 100644
--- a/mozilla/xpfe/components/history/resources/Makefile.in
+++ b/mozilla/xpfe/components/history/resources/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,30 @@
 # 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@
 
-FILES = \
-	$(NULL)
-
-CHROME_DIR          = history
-CHROME_CONTENT_DIR  = content/default
-CHROME_SKIN_DIR     = skin/default
-CHROME_SOURCE_DIR   = $(srcdir)
-
-CHROME_CONTENT = \
-	history.xul \
-	history.js \
-	history-test.xul \
-	history-test.js \
-	$(NULL)
-
-CHROME_SKIN = \
-	history.css \
-	$(NULL)
-
-CHROME_L10N = \
-	./locale/en-US/history.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= history
+CHROME_CONTENT_DIR = content/default
+CHROME_SKIN_DIR	= skin/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		history.xul \
+		history.js \
+		history-test.xul \
+		history-test.js \
+		$(NULL)
+
+CHROME_SKIN	= history.css
+
+CHROME_L10N	= ./locale/en-US/history.dtd
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/history/src/Makefile.in b/mozilla/xpfe/components/history/src/Makefile.in
index c7af5174ade..b798dada72e 100644
--- a/mozilla/xpfe/components/history/src/Makefile.in
+++ b/mozilla/xpfe/components/history/src/Makefile.in
@@ -36,3 +36,4 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/prefwindow/Makefile.in b/mozilla/xpfe/components/prefwindow/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/prefwindow/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/prefwindow/public/Makefile.in b/mozilla/xpfe/components/prefwindow/public/Makefile.in
index 515006fe400..4a968bdd1f0 100644
--- a/mozilla/xpfe/components/prefwindow/public/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/public/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,21 +13,18 @@
 # 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
 
-MODULE=prefwindow
+MODULE		= prefwindow
 
-XPIDLSRCS =				\
-		nsIPrefWindow.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsIPrefWindow.idl
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/Makefile.in
index 9e7244f316a..1c8c2790960 100644
--- a/mozilla/xpfe/components/prefwindow/resources/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/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,17 +13,16 @@
 # 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
 
-DIRS = content skin locale
+DIRS		= content skin locale
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
index 59baf79607e..5350e5dc98d 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/content/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,42 +13,41 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+EXPORT_RESOURCE_CONTENT = \
+		$(srcdir)/PrefsWindow.html \
+		$(srcdir)/PrefsWindow.js \
+		$(srcdir)/PrefsWindow.xul \
+		$(srcdir)/pref-advanced.xul \
+		$(srcdir)/pref-appearance.xul \
+		$(srcdir)/pref-applications.xul \
+		$(srcdir)/pref-cache.xul \
+		$(srcdir)/pref-colors.xul \
+		$(srcdir)/pref-composer.xul \
+		$(srcdir)/pref-debug.xul \
+		$(srcdir)/pref-download.xul \
+		$(srcdir)/pref-fonts.xul \
+		$(srcdir)/pref-languages.xul \
+		$(srcdir)/pref-navigator.xul \
+		$(srcdir)/pref-offline.xul \
+		$(srcdir)/pref-proxies.xul \
+		$(srcdir)/pref-publish.xul \
+		$(srcdir)/pref-select.html \
+		$(srcdir)/pref-smart_browsing.xul \
+		$(srcdir)/pref-smartupdate.xul \
+		$(srcdir)/preftree.xul \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/PrefsWindow.html \
-	$(srcdir)/PrefsWindow.js \
-	$(srcdir)/PrefsWindow.xul \
-	$(srcdir)/pref-advanced.xul \
-	$(srcdir)/pref-appearance.xul \
-	$(srcdir)/pref-applications.xul \
-	$(srcdir)/pref-cache.xul \
-	$(srcdir)/pref-colors.xul \
-	$(srcdir)/pref-composer.xul \
-	$(srcdir)/pref-debug.xul \
-	$(srcdir)/pref-download.xul \
-	$(srcdir)/pref-fonts.xul \
-	$(srcdir)/pref-languages.xul \
-	$(srcdir)/pref-navigator.xul \
-	$(srcdir)/pref-offline.xul \
-	$(srcdir)/pref-proxies.xul \
-	$(srcdir)/pref-publish.xul \
-	$(srcdir)/pref-select.html \
-	$(srcdir)/pref-smart_browsing.xul \
-	$(srcdir)/pref-smartupdate.xul \
-	$(srcdir)/preftree.xul \
-	$(NULL)
-
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/pref/content/default
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/locale/Makefile.in
index 6ec6e2e4225..9610e63cfc3 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/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,17 +13,16 @@
 # 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
 
-DIRS = en-US
+DIRS		= en-US
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
index f1e48af78d9..c408d107a25 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/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,39 +13,38 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+EXPORT_RESOURCE_CONTENT = \
+		$(srcdir)/PrefsWindow.dtd \
+		$(srcdir)/pref-advanced.dtd \
+		$(srcdir)/pref-appearance.dtd \
+		$(srcdir)/pref-applications.dtd \
+		$(srcdir)/pref-cache.dtd \
+		$(srcdir)/pref-colors.dtd \
+		$(srcdir)/pref-composer.dtd \
+		$(srcdir)/pref-debug.dtd \
+		$(srcdir)/pref-download.dtd \
+		$(srcdir)/pref-fonts.dtd \
+		$(srcdir)/pref-languages.dtd \
+		$(srcdir)/pref-navigator.dtd \
+		$(srcdir)/pref-offline.dtd \
+		$(srcdir)/pref-proxies.dtd \
+		$(srcdir)/pref-publish.dtd \
+		$(srcdir)/pref-smart_browsing.dtd \
+		$(srcdir)/pref-smartupdate.dtd \
+		$(srcdir)/preftree.dtd \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/PrefsWindow.dtd \
-	$(srcdir)/pref-advanced.dtd \
-	$(srcdir)/pref-appearance.dtd \
-	$(srcdir)/pref-applications.dtd \
-	$(srcdir)/pref-cache.dtd \
-	$(srcdir)/pref-colors.dtd \
-	$(srcdir)/pref-composer.dtd \
-	$(srcdir)/pref-debug.dtd \
-	$(srcdir)/pref-download.dtd \
-	$(srcdir)/pref-fonts.dtd \
-	$(srcdir)/pref-languages.dtd \
-	$(srcdir)/pref-navigator.dtd \
-	$(srcdir)/pref-offline.dtd \
-	$(srcdir)/pref-proxies.dtd \
-	$(srcdir)/pref-publish.dtd \
-	$(srcdir)/pref-smart_browsing.dtd \
-	$(srcdir)/pref-smartupdate.dtd \
-	$(srcdir)/preftree.dtd \
-	$(NULL)
-
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/pref/locale/en-US
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/skin/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/skin/Makefile.in
index c00f1b65835..caf9655a4b4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/skin/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/skin/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,22 @@
 # 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
-include $(topsrcdir)/config/rules.mk
 
 EXPORT_RESOURCE_SKIN = \
-	$(srcdir)/pref.css \
-	$(srcdir)/preftree.css \
-	$(NULL)
+		$(srcdir)/pref.css \
+		$(srcdir)/preftree.css \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/pref/skin/default
+
diff --git a/mozilla/xpfe/components/public/Makefile.in b/mozilla/xpfe/components/public/Makefile.in
index 83696889333..1c97c547ca3 100644
--- a/mozilla/xpfe/components/public/Makefile.in
+++ b/mozilla/xpfe/components/public/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,24 +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
 
-EXPORTS=	\
-		nsIAppShellComponentImpl.h	\
-		$(NULL)
+XPIDL_MODULE	= mozcomps
 
-XPIDL_MODULE=mozcomps
+EXPORTS		= nsIAppShellComponentImpl.h
 
-XPIDLSRCS=\
-    nsIAppShellComponent.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsIAppShellComponent.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/related/Makefile.in b/mozilla/xpfe/components/related/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/related/Makefile.in
+++ b/mozilla/xpfe/components/related/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/related/public/Makefile.in b/mozilla/xpfe/components/related/public/Makefile.in
index 293c740f243..4375fce8358 100644
--- a/mozilla/xpfe/components/related/public/Makefile.in
+++ b/mozilla/xpfe/components/related/public/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,19 +13,18 @@
 # 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
 
-MODULE=related
+MODULE		= related
 
-XPIDLSRCS	= nsIRelatedLinksHandler.idl	\
-		  $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+XPIDLSRCS	= nsIRelatedLinksHandler.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/related/resources/Makefile.in b/mozilla/xpfe/components/related/resources/Makefile.in
index e2b5250c411..bf4c4efe913 100644
--- a/mozilla/xpfe/components/related/resources/Makefile.in
+++ b/mozilla/xpfe/components/related/resources/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,31 +13,31 @@
 # 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@
 
-CHROME_DIR          = related
-CHROME_CONTENT_DIR  = content/default
-CHROME_SKIN_DIR     = skin/default
-CHROME_SOURCE_DIR   = $(srcdir)
-
-CHROME_CONTENT = \
-	related-panel.xul \
-	related-panel.js \
-	$(NULL)
-
-CHROME_SKIN = \
-	related-panel.css \
-	sitemap.gif \
-	$(NULL)
-
-CHROME_L10N = \
-	./locale/en-US/related-panel.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= related
+CHROME_CONTENT_DIR = content/default
+CHROME_SKIN_DIR	= skin/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		related-panel.xul \
+		related-panel.js \
+		$(NULL)
+
+CHROME_SKIN	= \
+		related-panel.css \
+		sitemap.gif \
+		$(NULL)
+
+CHROME_L10N	= ./locale/en-US/related-panel.dtd
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/sample/Makefile.in b/mozilla/xpfe/components/sample/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/sample/Makefile.in
+++ b/mozilla/xpfe/components/sample/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/sample/public/Makefile.in b/mozilla/xpfe/components/sample/public/Makefile.in
index 3c4937f0f6b..be942fdebae 100644
--- a/mozilla/xpfe/components/sample/public/Makefile.in
+++ b/mozilla/xpfe/components/sample/public/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,24 +13,18 @@
 # 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
 
-EXPORTS =				\
-		$(NULL)
+XPIDL_MODULE	= mozsampl
 
-XPIDL_MODULE=mozsampl
-
-XPIDLSRCS=\
-    nsISampleAppShellComponent.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsISampleAppShellComponent.idl
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/sample/resources/Makefile.in b/mozilla/xpfe/components/sample/resources/Makefile.in
index 34dd7150f4c..3a46d40c0d7 100644
--- a/mozilla/xpfe/components/sample/resources/Makefile.in
+++ b/mozilla/xpfe/components/sample/resources/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,17 @@
 # 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
+
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_RESOURCE_SAMPLES = \
-	$(srcdir)/nsSampleAppShellComponent.xul \
-	$(NULL)
-
 install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/nsSampleAppShellComponent.xul $(DIST)/bin/res/samples
 
diff --git a/mozilla/xpfe/components/sample/src/Makefile.in b/mozilla/xpfe/components/sample/src/Makefile.in
index 1374e415e26..74990f80e28 100644
--- a/mozilla/xpfe/components/sample/src/Makefile.in
+++ b/mozilla/xpfe/components/sample/src/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/xpfe/components/search/Makefile.in b/mozilla/xpfe/components/search/Makefile.in
index adadd11211d..3f6359ba10f 100644
--- a/mozilla/xpfe/components/search/Makefile.in
+++ b/mozilla/xpfe/components/search/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,16 +13,16 @@
 # 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
 
-DIRS = datasets resources public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= datasets resources public src
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/search/datasets/Makefile.in b/mozilla/xpfe/components/search/datasets/Makefile.in
index e0af26cbec3..cccdd1188ea 100644
--- a/mozilla/xpfe/components/search/datasets/Makefile.in
+++ b/mozilla/xpfe/components/search/datasets/Makefile.in
@@ -15,30 +15,28 @@
 # Reserved.
 #
 
-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+FILES		= \
+		AOL_NetFind.gif \
+		AOL_NetFind.src \
+		Google.gif \
+		Google.src \
+		GoTo.com.gif \
+		GoTo.com.src \
+		Netscape_Open_Directory.gif \
+		Netscape_Open_Directory.src \
+		Snap.com.gif \
+		Snap.com.src \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
-FILES = \
-	AOL_NetFind.gif				\
-	AOL_NetFind.src				\
-	Google.gif				\
-	Google.src				\
-	GoTo.com.gif				\
-	GoTo.com.src				\
-	Netscape_Open_Directory.gif		\
-	Netscape_Open_Directory.src		\
-	Snap.com.gif				\
-	Snap.com.src				\
-	$(NULL)
-
-FILES := $(addprefix $(srcdir)/, $(FILES))
-
 install::
-	$(INSTALL) $(FILES) $(DIST)/bin/res/rdf/datasets
+	$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/res/rdf/datasets
 
diff --git a/mozilla/xpfe/components/search/public/Makefile.in b/mozilla/xpfe/components/search/public/Makefile.in
index 38394750559..10864d6c4d6 100755
--- a/mozilla/xpfe/components/search/public/Makefile.in
+++ b/mozilla/xpfe/components/search/public/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,19 +13,18 @@
 # 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
 
-MODULE=search
+MODULE		= search
 
-XPIDLSRCS	= nsISearchService.idl	\
-		  $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+XPIDLSRCS	= nsISearchService.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/search/resources/Makefile.in b/mozilla/xpfe/components/search/resources/Makefile.in
index 3a5c62c7137..35c263f3e34 100755
--- a/mozilla/xpfe/components/search/resources/Makefile.in
+++ b/mozilla/xpfe/components/search/resources/Makefile.in
@@ -15,36 +15,34 @@
 # Reserved.
 #
 
-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+FILES		= \
+		default.htm \
+		search.js \
+		search.css \
+		search.xul \
+		shared.js \
+		find.js \
+		find.xul \
+		findresults.css \
+		findresults.xul \
+		icons.css \
+		internet.css \
+		internet.js \
+		internet.xul \
+		internetresults.css \
+		internetresults.js \
+		internetresults.xul \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
-FILES = \
-	default.htm		\
-	search.js		\
-	search.css		\
-	search.xul		\
-	shared.js		\
-	find.js			\
-	find.xul		\
-	findresults.css		\
-	findresults.xul		\
-	icons.css		\
-	internet.css		\
-	internet.js		\
-	internet.xul		\
-	internetresults.css	\
-	internetresults.js	\
-	internetresults.xul	\
-	$(NULL)
-
-FILES := $(addprefix $(srcdir)/, $(FILES))
-
 install::
-	$(INSTALL) $(FILES) $(DIST)/bin/res/samples
+	$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/res/samples
 
diff --git a/mozilla/xpfe/components/search/src/Makefile.in b/mozilla/xpfe/components/search/src/Makefile.in
index 8ca2d651bd3..018e1b4fbdd 100755
--- a/mozilla/xpfe/components/search/src/Makefile.in
+++ b/mozilla/xpfe/components/search/src/Makefile.in
@@ -26,17 +26,18 @@ MODULE		= search
 LIBRARY_NAME	= search
 IS_COMPONENT	= 1
 
-CPPSRCS         = nsInternetSearchService.cpp  \
-                  nsLocalSearchService.cpp     \
-                  nsRegisterSearch.cpp         \
-                  $(NULL)
+CPPSRCS		= \
+		nsInternetSearchService.cpp \
+		nsLocalSearchService.cpp \
+		nsRegisterSearch.cpp \
+		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_NECKO_UTIL_LIBS) \
-		-L$(DIST)/bin	\
-		-lxpcom		\
-		-lmozjs		\
-		$(NSPR_LIBS)	\
+		-L$(DIST)/bin \
+		-lxpcom \
+		-lmozjs \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/sidebar/Makefile.in b/mozilla/xpfe/components/sidebar/Makefile.in
index a12a9e53061..182a887ffed 100644
--- a/mozilla/xpfe/components/sidebar/Makefile.in
+++ b/mozilla/xpfe/components/sidebar/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/sidebar/resources/Makefile.in b/mozilla/xpfe/components/sidebar/resources/Makefile.in
index 001f754d52f..912cb4c8de1 100644
--- a/mozilla/xpfe/components/sidebar/resources/Makefile.in
+++ b/mozilla/xpfe/components/sidebar/resources/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,65 +13,67 @@
 # 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@
 
-CHROME_DIR          = sidebar
-CHROME_CONTENT_DIR  = content/default
-CHROME_SKIN_DIR     = skin/default
-CHROME_SOURCE_DIR	= $(srcdir)
-
-CHROME_CONTENT = \
-	customize-panel.js \
-	customize-panel.xul \
-	customize.js \
-	customize.xul \
-	dummy-flash.rdf \
-	flash-registry.rdf \
-	flash.js \
-	flash.xul \
-	preview.css \
-	preview.js \
-	preview.xul \
-	sidebar-browser.rdf \
-	sidebar-browser.xul \
-	sidebar-registry.rdf \
-	sidebar.js \
-	sidebar.rdf \
-	sidebarOverlay.js \
-	sidebarOverlay.xul \
-	$(NULL)
-
-CHROME_SKIN = \
-	customize-panel.css \
-	customize.css \
-	flash.css \
-	sidebar.css \
-	sidebarOverlay.css \
-	corner.gif \
-	flames.gif \
-	list-down-dis.gif \
-	list-down.gif \
-	list-up-dis.gif \
-	list-up.gif \
-	showhide.gif \
-	showhide-inv.gif \
-	$(NULL)
-
-CHROME_L10N = \
-	./locale/en-US/customize-panel.dtd \
-	./locale/en-US/customize.dtd \
-	./locale/en-US/flash.dtd \
-	./locale/en-US/preview.dtd \
-	./locale/en-US/sidebar-browser-rdf.dtd \
-	./locale/en-US/sidebar-browser.dtd \
-	./locale/en-US/sidebar-registry-rdf.dtd \
-        ./locale/en-US/sidebarOverlay.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= sidebar
+CHROME_CONTENT_DIR = content/default
+CHROME_SKIN_DIR	= skin/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		customize-panel.js \
+		customize-panel.xul \
+		customize.js \
+		customize.xul \
+		dummy-flash.rdf \
+		flash-registry.rdf \
+		flash.js \
+		flash.xul \
+		preview.css \
+		preview.js \
+		preview.xul \
+		sidebar-browser.rdf \
+		sidebar-browser.xul \
+		sidebar-registry.rdf \
+		sidebar.js \
+		sidebar.rdf \
+		sidebarOverlay.js \
+		sidebarOverlay.xul \
+		$(NULL)
+
+CHROME_SKIN	= \
+		customize-panel.css \
+		customize.css \
+		flash.css \
+		sidebar.css \
+		sidebarOverlay.css \
+		corner.gif \
+		flames.gif \
+		list-down-dis.gif \
+		list-down.gif \
+		list-up-dis.gif \
+		list-up.gif \
+		showhide.gif \
+		showhide-inv.gif \
+		$(NULL)
+
+CHROME_L10N	= \
+		./locale/en-US/customize-panel.dtd \
+		./locale/en-US/customize.dtd \
+		./locale/en-US/flash.dtd \
+		./locale/en-US/preview.dtd \
+		./locale/en-US/sidebar-browser-rdf.dtd \
+		./locale/en-US/sidebar-browser.dtd \
+		./locale/en-US/sidebar-registry-rdf.dtd \
+		./locale/en-US/sidebarOverlay.dtd \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/ucth/Makefile.in b/mozilla/xpfe/components/ucth/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/ucth/Makefile.in
+++ b/mozilla/xpfe/components/ucth/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/ucth/public/Makefile.in b/mozilla/xpfe/components/ucth/public/Makefile.in
index e5c3825946c..002678078dd 100644
--- a/mozilla/xpfe/components/ucth/public/Makefile.in
+++ b/mozilla/xpfe/components/ucth/public/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,24 +13,18 @@
 # 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
 
-EXPORTS =				\
-		$(NULL)
+XPIDL_MODULE	= mozucth
 
-XPIDL_MODULE=mozucth
-
-XPIDLSRCS=\
-    nsIUnkContentTypeHandler.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsIUnkContentTypeHandler.idl
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/ucth/resources/Makefile.in b/mozilla/xpfe/components/ucth/resources/Makefile.in
index 67a707ca82d..1c0a9845d1d 100644
--- a/mozilla/xpfe/components/ucth/resources/Makefile.in
+++ b/mozilla/xpfe/components/ucth/resources/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,25 +13,25 @@
 # 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@
 
-CHROME_DIR = global
-CHROME_CONTENT_DIR = content/default
-CHROME_SOURCE_DIR  = $(srcdir)
-
-CHROME_CONTENT = \
-	unknownContent.xul \
-	unknownContent.js  \
-	$(NULL)
-
-CHROME_L10N = \
-	./locale/en-US/unknownContent.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= global
+CHROME_CONTENT_DIR = content/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		unknownContent.xul \
+		unknownContent.js \
+		$(NULL)
+
+CHROME_L10N	= ./locale/en-US/unknownContent.dtd
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/xfer/Makefile.in b/mozilla/xpfe/components/xfer/Makefile.in
index 0ec06f4e571..ea072a7e155 100644
--- a/mozilla/xpfe/components/xfer/Makefile.in
+++ b/mozilla/xpfe/components/xfer/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,16 +13,16 @@
 # 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
 
-DIRS = public src resources
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/xfer/public/Makefile.in b/mozilla/xpfe/components/xfer/public/Makefile.in
index 72c47f2eab1..a39eb141acc 100644
--- a/mozilla/xpfe/components/xfer/public/Makefile.in
+++ b/mozilla/xpfe/components/xfer/public/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,25 +13,21 @@
 # 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
 
-EXPORTS =				\
+XPIDL_MODULE	= mozxfer
+
+XPIDLSRCS	= \
+		nsIStreamTransfer.idl \
+		nsIStreamTransferOperation.idl \
 		$(NULL)
 
-XPIDL_MODULE=mozxfer
-
-XPIDLSRCS=\
-    nsIStreamTransfer.idl \
-    nsIStreamTransferOperation.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/xfer/resources/Makefile.in b/mozilla/xpfe/components/xfer/resources/Makefile.in
index 682b2f7f71d..28c479f6904 100644
--- a/mozilla/xpfe/components/xfer/resources/Makefile.in
+++ b/mozilla/xpfe/components/xfer/resources/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,26 +13,25 @@
 # 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@
 
-CHROME_DIR = global
-
-CHROME_CONTENT_DIR = content/default
-CHROME_SOURCE_DIR  = $(srcdir)
-
-CHROME_CONTENT = \
-	downloadProgress.xul \
-	downloadProgress.js  \
-	$(NULL)
-
-CHROME_L10N = \
-	./locale/en-US/downloadProgress.dtd \
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+CHROME_DIR	= global
+CHROME_CONTENT_DIR = content/default
+CHROME_SOURCE_DIR = $(srcdir)
+
+CHROME_CONTENT	= \
+		downloadProgress.xul \
+		downloadProgress.js \
+		$(NULL)
+
+CHROME_L10N	= ./locale/en-US/downloadProgress.dtd
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in
index 8167a7eb6af..0c121bfb349 100644
--- a/mozilla/xpfe/components/xfer/src/Makefile.in
+++ b/mozilla/xpfe/components/xfer/src/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/xpfe/global/Makefile.in b/mozilla/xpfe/global/Makefile.in
index 9450d92bdc0..a345776f2b0 100644
--- a/mozilla/xpfe/global/Makefile.in
+++ b/mozilla/xpfe/global/Makefile.in
@@ -15,13 +15,14 @@
 # Reserved.
 #
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = resources
+DIRS		= resources
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in
index 28fb40b1ff5..55aa3047ecf 100644
--- a/mozilla/xpfe/global/resources/content/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/Makefile.in
@@ -15,31 +15,31 @@
 # Reserved.
 #
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=unix
-
-include $(topsrcdir)/config/rules.mk
+DIRS		= unix
 
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/hiddenWindow.xul \
-	$(srcdir)/globalOverlay.xul \
-	$(srcdir)/globalOverlay.js \
-	$(srcdir)/tasksOverlay.xul \
-	$(srcdir)/tasksOverlay.js \
-	$(srcdir)/dialogOverlay.xul \
-	$(srcdir)/dialogOverlay.js \
-	$(srcdir)/tasksExtension.xul \
-	$(srcdir)/commonDialog.xul \
-	$(srcdir)/commonDialog.js \
-	$(srcdir)/strres.js \
-	$(srcdir)/about.html \
-	$(NULL)
+		$(srcdir)/hiddenWindow.xul \
+		$(srcdir)/globalOverlay.xul \
+		$(srcdir)/globalOverlay.js \
+		$(srcdir)/tasksOverlay.xul \
+		$(srcdir)/tasksOverlay.js \
+		$(srcdir)/dialogOverlay.xul \
+		$(srcdir)/dialogOverlay.js \
+		$(srcdir)/tasksExtension.xul \
+		$(srcdir)/commonDialog.xul \
+		$(srcdir)/commonDialog.js \
+		$(srcdir)/strres.js \
+		$(srcdir)/about.html \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content/default
diff --git a/mozilla/xpfe/global/resources/content/unix/Makefile.in b/mozilla/xpfe/global/resources/content/unix/Makefile.in
index 28ba665cce0..d252cec01a8 100644
--- a/mozilla/xpfe/global/resources/content/unix/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/unix/Makefile.in
@@ -15,19 +15,19 @@
 # Reserved.
 #
 
-DEPTH = ../../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/rules.mk
-
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/platformGlobalOverlay.xul \
-	$(srcdir)/platformDialogOverlay.xul \
-	$(NULL)
+		$(srcdir)/platformGlobalOverlay.xul \
+		$(srcdir)/platformDialogOverlay.xul \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/content/default
diff --git a/mozilla/xpfe/global/resources/locale/Makefile.in b/mozilla/xpfe/global/resources/locale/Makefile.in
index 700e9c14fd3..40d1d2207ac 100644
--- a/mozilla/xpfe/global/resources/locale/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/Makefile.in
@@ -15,23 +15,23 @@
 # Reserved.
 #
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=unix
-
-include $(topsrcdir)/config/rules.mk
+DIRS		= unix
 
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/globalOverlay.dtd \
-	$(srcdir)/dialogOverlay.dtd \
-	$(srcdir)/tasksOverlay.dtd \
-	$(srcdir)/commonDialog.dtd \
-	$(NULL)
+		$(srcdir)/globalOverlay.dtd \
+		$(srcdir)/dialogOverlay.dtd \
+		$(srcdir)/tasksOverlay.dtd \
+		$(srcdir)/commonDialog.dtd \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale/en-US
diff --git a/mozilla/xpfe/global/resources/locale/unix/Makefile.in b/mozilla/xpfe/global/resources/locale/unix/Makefile.in
index c7e8e7d7905..f19749d3212 100644
--- a/mozilla/xpfe/global/resources/locale/unix/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/unix/Makefile.in
@@ -15,19 +15,19 @@
 # Reserved.
 #
 
-DEPTH = ../../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/rules.mk
-
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/platformGlobalOverlay.dtd \
-	$(srcdir)/platformDialogOverlay.dtd \
-	$(NULL)
+		$(srcdir)/platformGlobalOverlay.dtd \
+		$(srcdir)/platformDialogOverlay.dtd \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale/en-US
diff --git a/mozilla/xpfe/global/resources/skin/Makefile.in b/mozilla/xpfe/global/resources/skin/Makefile.in
index d49d1498c24..d0e80800f9c 100644
--- a/mozilla/xpfe/global/resources/skin/Makefile.in
+++ b/mozilla/xpfe/global/resources/skin/Makefile.in
@@ -15,57 +15,57 @@
 # Reserved.
 #
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/rules.mk
-
 EXPORT_RESOURCE_CONTENT = \
-	$(srcdir)/dialogs.css \
-	$(srcdir)/tasksOverlay.css \
-	$(srcdir)/xul.css \
-	$(srcdir)/lessCols.gif \
-	$(srcdir)/lessCols_mo.gif \
-	$(srcdir)/lessCOls_dis.gif \
-	$(srcdir)/moreCols.gif \
-	$(srcdir)/moreCols_mo.gif \
-	$(srcdir)/moreCols_dis.gif \
-	$(srcdir)/scrollUp.gif \
-	$(srcdir)/scrollUp_mo.gif \
-	$(srcdir)/scrollUp_dis.gif \
-	$(srcdir)/scrollDown.gif \
-	$(srcdir)/scrollDown_mo.gif \
-	$(srcdir)/scrollDown_dis.gif \
-    $(srcdir)/scroll-left.gif \
-	$(srcdir)/scroll-left-hover.gif \
-	$(srcdir)/scroll-left-disabled.gif \
-	$(srcdir)/scroll-right.gif \
-	$(srcdir)/scroll-right-hover.gif \
-	$(srcdir)/scroll-right-disabled.gif \
-	$(srcdir)/scroll-thumb-horiz.gif \
-	$(srcdir)/scroll-thumb-horiz-hover.gif \
-	$(srcdir)/scroll-thumb-horiz-disabled.gif \
-    $(srcdir)/scroll-thumb-vert.gif \
-	$(srcdir)/scroll-thumb-vert-hover.gif \
-	$(srcdir)/scroll-thumb-vert-disabled.gif \
-	$(srcdir)/menuArrow.gif \
-	$(srcdir)/menuArrow_mo.gif \
-	$(srcdir)/menuArrow_dis.gif \
-	$(srcdir)/menuCheck.gif \
-	$(srcdir)/menuCheck_mo.gif \
-	$(srcdir)/menuCheck_dis.gif \
-	$(srcdir)/opentwisty.gif \
-	$(srcdir)/closedtwisty.gif \
-	$(srcdir)/alert-icon.gif \
-	$(srcdir)/error-icon.gif \
-	$(srcdir)/message-icon.gif \
-	$(srcdir)/question-icon.gif \
-	$(srcdir)/return.gif \
-	$(NULL)
+		$(srcdir)/dialogs.css \
+		$(srcdir)/tasksOverlay.css \
+		$(srcdir)/xul.css \
+		$(srcdir)/lessCols.gif \
+		$(srcdir)/lessCols_mo.gif \
+		$(srcdir)/lessCOls_dis.gif \
+		$(srcdir)/moreCols.gif \
+		$(srcdir)/moreCols_mo.gif \
+		$(srcdir)/moreCols_dis.gif \
+		$(srcdir)/scrollUp.gif \
+		$(srcdir)/scrollUp_mo.gif \
+		$(srcdir)/scrollUp_dis.gif \
+		$(srcdir)/scrollDown.gif \
+		$(srcdir)/scrollDown_mo.gif \
+		$(srcdir)/scrollDown_dis.gif \
+		$(srcdir)/scroll-left.gif \
+		$(srcdir)/scroll-left-hover.gif \
+		$(srcdir)/scroll-left-disabled.gif \
+		$(srcdir)/scroll-right.gif \
+		$(srcdir)/scroll-right-hover.gif \
+		$(srcdir)/scroll-right-disabled.gif \
+		$(srcdir)/scroll-thumb-horiz.gif \
+		$(srcdir)/scroll-thumb-horiz-hover.gif \
+		$(srcdir)/scroll-thumb-horiz-disabled.gif \
+		$(srcdir)/scroll-thumb-vert.gif \
+		$(srcdir)/scroll-thumb-vert-hover.gif \
+		$(srcdir)/scroll-thumb-vert-disabled.gif \
+		$(srcdir)/menuArrow.gif \
+		$(srcdir)/menuArrow_mo.gif \
+		$(srcdir)/menuArrow_dis.gif \
+		$(srcdir)/menuCheck.gif \
+		$(srcdir)/menuCheck_mo.gif \
+		$(srcdir)/menuCheck_dis.gif \
+		$(srcdir)/opentwisty.gif \
+		$(srcdir)/closedtwisty.gif \
+		$(srcdir)/alert-icon.gif \
+		$(srcdir)/error-icon.gif \
+		$(srcdir)/message-icon.gif \
+		$(srcdir)/question-icon.gif \
+		$(srcdir)/return.gif \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/skin/default