diff --git a/mozilla/caps/idl/nsIPrincipal.idl b/mozilla/caps/idl/nsIPrincipal.idl
index 9fc908c59ad..09a7bdba124 100644
--- a/mozilla/caps/idl/nsIPrincipal.idl
+++ b/mozilla/caps/idl/nsIPrincipal.idl
@@ -50,4 +50,4 @@ interface nsICertificatePrincipal : nsIPrincipal {
 	void GetSerialNumber(out string ppSerialNumber);
 	void GetExpirationDate(out string ppExpDate);
 	void GetFingerPrint(out string ppFingerPrint);
-};
\ No newline at end of file
+};
diff --git a/mozilla/dom/tools/Makefile.in b/mozilla/dom/tools/Makefile.in
index 1d46c57161d..92d03e841cf 100644
--- a/mozilla/dom/tools/Makefile.in
+++ b/mozilla/dom/tools/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,52 +13,40 @@
 # 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
+PROGRAM		= idlc
 
-
-CPPSRCS =  \
-	   	main.cpp		\
-		IdlParser.cpp		\
-		IdlScanner.cpp		\
-		Exceptions.cpp		\
-		IdlObject.cpp		\
-		IdlVariable.cpp		\
-		IdlAttribute.cpp	\
-		IdlEnum.cpp		\
-		IdlFunction.cpp		\
-		IdlInterface.cpp	\
-		IdlParameter.cpp	\
-		IdlSpecification.cpp	\
-		FileGen.cpp		\
-		XPCOMGen.cpp		\
-		JSStubGen.cpp		\
+CPPSRCS		= \
+		main.cpp \
+		IdlParser.cpp \
+		IdlScanner.cpp \
+		Exceptions.cpp \
+		IdlObject.cpp \
+		IdlVariable.cpp \
+		IdlAttribute.cpp \
+		IdlEnum.cpp \
+		IdlFunction.cpp \
+		IdlInterface.cpp \
+		IdlParameter.cpp \
+		IdlSpecification.cpp \
+		FileGen.cpp \
+		XPCOMGen.cpp \
+		JSStubGen.cpp \
 		$(NULL)
 
-OBJS	= $(CPPSRCS:.cpp=.o)
-
-PROGRAM = $(OBJDIR)/idlc
-
-TARGETS = $(PROGS)
-
-INCLUDES += \
-			-I$(PUBLIC)/raptor \
-			-I$(PUBLIC)/xpcom \
-			$(NULL)
-
-LIBS+=\
-	$(NSPR_LIBS) \
-	-lxpcom	\
-	-lreg	\
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
+LIBS		+= \
+		$(NSPR_LIBS) \
+		-lxpcom \
+		-lmozreg \
+		$(NULL)
 
diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in
index 4c5635c72bb..c8b386a5ab2 100644
--- a/mozilla/extensions/cookie/tests/Makefile.in
+++ b/mozilla/extensions/cookie/tests/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -22,25 +22,22 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= TestCookie
 CPPSRCS		= TestCookie.cpp
 
-LOCAL_INCLUDES  =
-
 REQUIRES	= js cookie pref xpcom include
 
 LIBS		= \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM		= TestCookie
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 # hack until necko lands
 ifndef NECKO
-PUBLIC=$(DEPTH)/netwerk/dist/include
+PUBLIC		= $(DEPTH)/netwerk/dist/include
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/gfx/src/motif/Makefile.in b/mozilla/gfx/src/motif/Makefile.in
index f292ff5d47e..db455a2a762 100644
--- a/mozilla/gfx/src/motif/Makefile.in
+++ b/mozilla/gfx/src/motif/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,36 +13,40 @@
 # 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	= gfx_motif
+MODULE		= raptor
 
-LIBRARY_NAME = gfx_motif
+REQUIRES	= util img xpcom raptor netlib
 
-MODULE=raptor 
-
-REQUIRES=util img xpcom raptor netlib
-
-DEFINES += -D_IMPL_NS_GFXONXP
-
-EXTRA_DSO_LDOPTS+=\
-	-L$(DIST)/bin \
-	-lxpcom \
-	-lraptorgfx \
-	-lreg \
-	$(NSPR_LIBS)
-
-EXTRA_DSO_LDOPTS+= $(XLDFLAGS) $(XLIBS)
-
-
-CPPSRCS=nsDeviceContextMotif.cpp nsFontMetricsMotif.cpp nsGfxFactoryMotif.cpp \
-	nsRenderingContextMotif.cpp nsRegionMotif.cpp nsImageMotif.cpp
+CPPSRCS		= \
+		nsDeviceContextMotif.cpp \
+		nsFontMetricsMotif.cpp \
+		nsGfxFactoryMotif.cpp \
+		nsRenderingContextMotif.cpp \
+		nsRegionMotif.cpp \
+		nsImageMotif.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+LIBS		+= \
+		-L$(DIST)/bin \
+		-lxpcom \
+		-lraptorgfx \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(XLDFLAGS) \
+		$(XLIBS) \
+		$(NULL)
+
+DEFINES		+= -D_IMPL_NS_GFXONXP
+
diff --git a/mozilla/gfx/src/rhapsody/Makefile.in b/mozilla/gfx/src/rhapsody/Makefile.in
index d2fde538fc3..6335ebcaa52 100644
--- a/mozilla/gfx/src/rhapsody/Makefile.in
+++ b/mozilla/gfx/src/rhapsody/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@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+#LIBRARY_NAME	= gfxunix
+MODULE		= raptor
 
-#LIBRARY_NAME = gfxunix
-#
-MODULE=raptor 
+#REQUIRES	= util img xpcom raptor netlib
 
-#REQUIRES=util img xpcom raptor netlib
-
-#LCFLAGS+=-D_IMPL_NS_GFXONXP
-
-#EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lraptorgfx \
--lreg $(NSPR_LIBS)
-
-
-#CPPSRCS = \
-	nsDeviceContextUnix.cpp \
-	nsFontMetricsUnix.cpp \
-	nsGfxFactoryUnix.cpp \
-	nsRenderingContextUnix.cpp \
-	nsRegionUnix.cpp \
-	nsImageUnix.cpp
+#CPPSRCS	= \
+#		nsDeviceContextUnix.cpp \
+#		nsFontMetricsUnix.cpp \
+#		nsGfxFactoryUnix.cpp \
+#		nsRenderingContextUnix.cpp \
+#		nsRegionUnix.cpp \
+#		nsImageUnix.cpp \
+#		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+#LCFLAGS	+= -D_IMPL_NS_GFXONXP
+
diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in
index fc689f64bd8..10d449d2405 100644
--- a/mozilla/gfx/tests/Makefile.in
+++ b/mozilla/gfx/tests/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,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@
 
 include $(DEPTH)/config/autoconf.mk
 
-#DIRS = btest
+#DIRS		= btest
 
-CPPSRCS = \
-	DumpColors.cpp		\
-	TestColorNames.cpp	\
-	TestRect.cpp		\
-	$(NULL)
+CPPSRCS		= \
+		DumpColors.cpp \
+		TestColorNames.cpp \
+		TestRect.cpp \
+		$(NULL)
+
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
 include $(topsrcdir)/config/config.mk
 
-INCLUDES+=-I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
-
 ifndef NECKO
-NET_LIBS =		\
-	-lnetlib \
-	-lhttpurl \
-	-lgophurl \
-	-labouturl \
-	-lremoturl \
-	-lfileurl \
-	-lftpurl \
-	-lnetwork \
-	-lsockstuburl \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetcache \
-	-lpwcac \
-	$(NULL)
+NET_LIBS	= \
+		-lnetlib \
+		-lhttpurl \
+		-lgophurl \
+		-labouturl \
+		-lremoturl \
+		-lfileurl \
+		-lftpurl \
+		-lnetwork \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetcache \
+		-lpwcac \
+		$(NULL)
 else
-NET_LIBS =		\
-	-lneckoutil_s \
-	$(NULL)
+NET_LIBS	= -lneckoutil_s
 endif
 
-LIBS = \
-	-lraptorgfx 	\
-	-lxpcom \
-	-lreg \
-	-lpref \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lsecfree \
-	-limg \
-	$(JPEG_LIBS) \
-	$(PNG_LIBS) \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lxp \
-	$(TIMER_LIBS) \
-	$(TK_LIBS) \
-	$(NSPR_LIBS) \
-	$(NET_LIBS)	 \
-	$(ZLIB_LIBS) \
-	$(NULL)
-
-
-
-SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+LIBS		= \
+		-lraptorgfx \
+		-lxpcom \
+		-lmozreg \
+		-lpref \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lsecfree \
+		-limg \
+		$(JPEG_LIBS) \
+		$(PNG_LIBS) \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lxp \
+		$(TIMER_LIBS) \
+		$(TK_LIBS) \
+		$(NSPR_LIBS) \
+		$(NET_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
+
diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in
index 3d6324724dd..39cb88cfab7 100644
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@@ -22,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
+
 include $(topsrcdir)/config/config.mk
 
 ifndef NECKO
@@ -30,8 +32,6 @@ else
 LIBRARY_NAME	= DebugRobot
 endif
 
-CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
-
 ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
@@ -54,10 +54,10 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-limg	\
+		-limg \
 		-lmozutil \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(ZLIB_LIBS) \
@@ -68,10 +68,9 @@ LIBS		= \
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
+
 else
-DIRS = test
+DIRS		= test
 endif
 
-
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in
index 36d7e66bd6c..7072b056109 100644
--- a/mozilla/htmlparser/robot/test/Makefile.in
+++ b/mozilla/htmlparser/robot/test/Makefile.in
@@ -13,38 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-IGNORE_MANIFEST=1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			\
-	RobotMain.cpp 		\
-	$(NULL)
+PROGRAM		= htmlrobot
 
-BASE_LIBS =	     \
-	-lreg	     \
-	-lxpcom	     \
-	$(NULL)
+REQUIRES	= xpcom
 
-LIBS =		       \
-	-lDebugRobot	\
-	$(BASE_LIBS)   \
-	$(NSPR_LIBS)   \
-	$(NULL)
+CPPSRCS		= RobotMain.cpp
+
+LIBS		= \
+		-lDebugRobot \
+		-lmozreg \
+		-lxpcom \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
-REQUIRES=xpcom
-
-PROGRAM = htmlrobot
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/htmlparser/tests/logparse/Makefile.in b/mozilla/htmlparser/tests/logparse/Makefile.in
index d36ca928cf5..9ded444e55a 100644
--- a/mozilla/htmlparser/tests/logparse/Makefile.in
+++ b/mozilla/htmlparser/tests/logparse/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,29 +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
 
-PROGRAM = logparse
+PROGRAM		= logparse
 
-CPPSRCS		= \
-	logparse.cpp	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-LIBS = \
-	-lraptorhtmlpars \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
+CPPSRCS		= logparse.cpp
 
+LIBS		= \
+		-lraptorhtmlpars \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/uconv/tests/Makefile.in b/mozilla/intl/uconv/tests/Makefile.in
index e7d9348cca5..e0e54b1aa33 100644
--- a/mozilla/intl/uconv/tests/Makefile.in
+++ b/mozilla/intl/uconv/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@
@@ -23,20 +24,17 @@ include $(DEPTH)/config/autoconf.mk
 
 CPPSRCS		= nsTestUConv.cpp 
 
-OBJS		= $(CPPSRCS:.cpp=.o)
-
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-#TARGETS		= $(SIMPLE_PROGRAMS)
-
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../ucvlatin  \
-                   -I$(srcdir)/../ucvja	\
-                   -I$(srcdir)/../ucvja2
+INCLUDES	+= \
+		-I$(srcdir)/../ucvlatin \
+		-I$(srcdir)/../ucvja \
+		-I$(srcdir)/../ucvja2 \
+		$(NULL)
 
-
-LIBS	        += $(NSPR_LIBS) -L$(DIST)/bin/ -lxpcom -lreg -luconv
+LIBS		+= $(NSPR_LIBS) -L$(DIST)/bin -lxpcom -lmozreg -luconv
 
 # needed for mac linux
 ifeq ($(OS_ARCH),Linux)
@@ -44,9 +42,3 @@ ifneq ($(OS_RELEASE),1.2)
 OS_LIBS		+= /usr/lib/libdl.so
 endif
 endif
-
-$(OBJDIR)/%.o: %.cpp
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(CFLAGS) -c $<
-
-install:: $(SIMPLE_PROGRAMS)
diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index e8ce618b2c7..d9e5d0d6090 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/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,53 +13,31 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = xpcshell
+MODULE		= xpcshell
+SIMPLE_PROGRAMS	= xpcshell
 
-SIMPLE_PROGRAMS = xpcshell
+CPPSRCS		= xpcshell.cpp
 
-CPPSRCS = \
-	xpcshell.cpp \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-DEFINES	+= -DJS_THREADSAFE
-
-LIBS		= 		\
-	-L$(DIST)/bin \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lxpcom       \
-	-lreg       \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NSPR_LIBS) 	\
-	$(NULL)
-
-
-# PROGS = $(OBJDIR)/TestXPC
-
-# TARGETS= $(PROGS)
+LIBS		= \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lmozreg \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-# INCLUDES	+= -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xpconnect \
-#                -I$(PUBLIC)/raptor
+DEFINES		+= -DJS_THREADSAFE
 
-#$(PROGS): $(OBJS)
-#	@$(MAKE_OBJDIR)
-#	$(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
-
-# export:: $(TARGETS)
-# 	$(INSTALL) $(PROGS) $(DIST)/bin
-# 	$(INSTALL) $(TEST_FILES) $(DIST)/bin
-
-# clobber::
-# 	rm -f $(DIST)/bin/TestXPC
-# 	rm -f $(PROGS) $(OBJS)
diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in
index 0918eeb019c..6bdc7b9f99c 100644
--- a/mozilla/js/src/xpconnect/src/Makefile.in
+++ b/mozilla/js/src/xpconnect/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
@@ -16,18 +15,37 @@
 # Reserved.
 #
 
-DEPTH=../../../..
-
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+LIBRARY_NAME	= xpconnect
+MODULE		= xpconnect
 
-LIBRARY_NAME=xpconnect
-MODULE=xpconnect
+CPPSRCS		= \
+		nsXPConnect.cpp \
+		xpcarbitrary.cpp \
+		xpccomponents.cpp \
+		xpccontext.cpp \
+		xpcconvert.cpp \
+		xpcjsid.cpp \
+		xpclog.cpp \
+		xpcmaps.cpp \
+		xpcmodule.cpp \
+		xpcstack.cpp \
+		xpcthreadcontext.cpp \
+		xpcthrower.cpp \
+		xpcwrappedjs.cpp \
+		xpcwrappedjsclass.cpp \
+		xpcwrappednative.cpp \
+		xpcwrappednativeclass.cpp \
+		xpcwrappednativejsops.cpp \
+		$(NULL)
+
+include $(topsrcdir)/config/config.mk
 
 # XXX hackage!
 # only copy the .so to components dir on platforms where xptcall is supported
@@ -35,101 +53,78 @@ MODULE=xpconnect
 # Unixish x86
 ifneq (,$(filter SunOS Linux FreeBSD NetBSD BSD_OS,$(OS_ARCH)))
 ifeq (86,$(findstring 86,$(OS_TEST)))
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # Neutrino Cross-Compiled for x86
 ifneq (,$(filter NTO,$(OS_TARGET)))
 ifeq (86,$(findstring 86,$(OS_TEST)))
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # Solaris/sparc
-ifneq (,$(filter SunOS,$(OS_ARCH)))
+ifeq ($(OS_ARCH),SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # NetBSD/m68k
-ifneq (,$(filter NetBSD,$(OS_ARCH)))
+ifeq ($(OS_ARCH),NetBSD)
 ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # BeOS/Intel
 ifeq ($(OS_ARCH),BeOS)
 ifeq ($(OS_TEST),BePC)
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 
 # IRIX
-ifeq ($(OS_ARCH), IRIX)
+ifeq ($(OS_ARCH),IRIX)
 ifneq ($(basename $(OS_RELEASE)),5)
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
 # OpenVMS (Alpha only at this point)
 ifeq ($(OS_ARCH),OpenVMS)
 ifeq ($(CPU_ARCH),Alpha)
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
-# Linux ARM
-ifeq ($(OS_ARCH),Linux)
+# Linux or NetBSD ARM
+ifneq (,$(filter Linux NetBSD,$(OS_ARCH)))
 ifeq (arm,$(findstring arm,$(OS_TEST)))
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 ifeq (sa110,$(findstring sa110,$(OS_TEST)))   
-IS_COMPONENT =  1
+IS_COMPONENT	= 1
 endif
 endif
 
-DEFINES	+= -DJSFILE -DJS_THREADSAFE
-
-CPPSRCS=		\
-	nsXPConnect.cpp		\
-	xpcarbitrary.cpp	\
-	xpccomponents.cpp	\
-	xpccontext.cpp		\
-	xpcconvert.cpp		\
-	xpcjsid.cpp	\
-	xpclog.cpp			\
-	xpcmaps.cpp			\
-	xpcmodule.cpp	\
-	xpcstack.cpp	\
-	xpcthreadcontext.cpp	\
-	xpcthrower.cpp		\
-	xpcwrappedjs.cpp	\
-	xpcwrappedjsclass.cpp	\
-	xpcwrappednative.cpp	\
-	xpcwrappednativeclass.cpp	\
-	xpcwrappednativejsops.cpp	\
-	$(NULL)
-
-# this is automatically discovered under BeOS
-ifneq ($(OS_ARCH),BeOS)
-
-EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-endif # BeOS
-
 include $(topsrcdir)/config/rules.mk
 
+# this is automatically discovered under BeOS
+ifneq ($(OS_ARCH),BeOS)
+LIBS		+= \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
+endif
+
+DEFINES		+= -DJSFILE -DJS_THREADSAFE
+
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index 38fc58ef43f..ec98b2bde7d 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/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,59 +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
 
-LOCAL_INCLUDES = -I$(srcdir)/../src
+PROGRAM		= TestSpaceManager
 
-CPPSRCS = \
-	TestSpaceManager.cpp \
-	$(NULL)
+CPPSRCS		= TestSpaceManager.cpp
 
-include $(topsrcdir)/config/config.mk
-
-PROGRAM = TestSpaceManager
-
-LIBS = \
-	-lnetlib \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lsockstuburl \
-	-lremoturl \
-	-lnetcnvts \
-	-lhttpurl \
-	-lmimetype \
-	-lpwcac \
-	-lnetcache \
-	-lnetwork \
-	$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
-	-lpref \
-	-lsecfree \
-	-lraptorgfx \
-	-limg \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	$(PNG_LIBS) \
-	$(JPEG_LIBS) \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	$(TIMER_LIBS) \
-	-lxpcom \
-	-lreg \
-	-lxp \
-	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
-	-ljsurl \
-	-ljsdom \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
+LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 include $(topsrcdir)/config/rules.mk
+
+LIBS		+= \
+		-lnetlib \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lsockstuburl \
+		-lremoturl \
+		-lnetcnvts \
+		-lhttpurl \
+		-lmimetype \
+		-lpwcac \
+		-lnetcache \
+		-lnetwork \
+		$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
+		-lpref \
+		-lsecfree \
+		-lraptorgfx \
+		-limg \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(PNG_LIBS) \
+		$(JPEG_LIBS) \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		$(TIMER_LIBS) \
+		-lxpcom \
+		-lmozreg \
+		-lxp \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsurl \
+		-ljsdom \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
+
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index 207e83f2a6e..a827f6a0cbd 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -41,7 +41,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		-lmsgbaseutil \
 		$(NULL)
 
diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in
index 27ba4b92dfe..11db3ed30b9 100644
--- a/mozilla/mailnews/base/tests/identity/Makefile.in
+++ b/mozilla/mailnews/base/tests/identity/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,34 +13,30 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM = identity
+PROGRAM		= identity
+CPPSRCS		= identity.cpp
 
-CPPSRCS = \
-		identity.cpp \
+LIBS		= \
+		-L$(DIST)/lib \
+		-L$(DIST)/bin \
+		-lxpcom \
+		-lmozreg \
+		-lmozjs \
+		-lsecfree \
+		$(TIMER_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
-LIBS =	\
-		-L$(DIST)/lib			\
-		-L$(DIST)/bin			\
-		-lxpcom					\
-		-lreg					\
-		-lmozjs					\
-		-lsecfree				\
-		$(TIMER_LIBS)			\
-		$(NSPR_LIBS)			\
-		$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-CXXFLAGS+=	$(MOZ_TOOLKIT_REGISTRY_CFLAGS)
-
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+
diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in
index e030c2545e4..3382620c0ae 100644
--- a/mozilla/mailnews/base/util/Makefile.in
+++ b/mozilla/mailnews/base/util/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,64 +13,62 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=msgbaseutil
-LIBRARY_NAME=msgbaseutil
+MODULE		= msgbaseutil
+LIBRARY_NAME	= msgbaseutil
 
-EXPORTS = \
-	nsMsgGroupRecord.h \
-	nsMsgLineBuffer.h	\
-	nsUInt32Array.h	\
-	nsMsgKeySet.h	\
-	nsMsgFolder.h	\
-	nsMsgDBFolder.h \
-	nsLocalFolderSummarySpec.h	\
-	nsNewsSummarySpec.h	\
-	nsMsgIdentity.h	\
-	nsMsgIncomingServer.h	\
-	nsMsgUtils.h \
-	nsMessage.h \
-	nsMsgProtocol.h \
-	nsMsgMailNewsUrl.h \
-	nsMsgTxn.h \
+CPPSRCS		= \
+		nsMsgGroupRecord.cpp \
+		nsMsgLineBuffer.cpp \
+		nsMsgFolder.cpp \
+		nsMsgDBFolder.cpp \
+		nsUInt32Array.cpp \
+		nsMsgKeySet.cpp \
+		nsLocalFolderSummarySpec.cpp \
+		nsNewsSummarySpec.cpp \
+		nsMsgIdentity.cpp \
+		nsMsgIncomingServer.cpp \
+		nsMsgUtils.cpp \
+		nsMessage.cpp \
+		nsMsgProtocol.cpp \
+		nsMsgMailNewsUrl.cpp \
+		nsMsgTxn.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsMsgGroupRecord.h \
+		nsMsgLineBuffer.h \
+		nsUInt32Array.h \
+		nsMsgKeySet.h \
+		nsMsgFolder.h \
+		nsMsgDBFolder.h \
+		nsLocalFolderSummarySpec.h \
+		nsNewsSummarySpec.h \
+		nsMsgIdentity.h \
+		nsMsgIncomingServer.h \
+		nsMsgUtils.h \
+		nsMessage.h \
+		nsMsgProtocol.h \
+		nsMsgMailNewsUrl.h \
+		nsMsgTxn.h \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	-L$(DIST)/bin \
+	-L$(DIST)/lib \
+	-lxpcom \
+	-lmozreg \
+	-lrdfutil_s \
+	$(NSPR_LIBS) \
 	$(NULL)
 
-CPPSRCS = \
-	nsMsgGroupRecord.cpp \
-	nsMsgLineBuffer.cpp	\
-	nsMsgFolder.cpp	\
-	nsMsgDBFolder.cpp \
-	nsUInt32Array.cpp	\
-	nsMsgKeySet.cpp	\
-	nsLocalFolderSummarySpec.cpp	\
-	nsNewsSummarySpec.cpp	\
-	nsMsgIdentity.cpp	\
-	nsMsgIncomingServer.cpp	\
-	nsMsgUtils.cpp \
-	nsMessage.cpp \
-	nsMsgProtocol.cpp \
-	nsMsgMailNewsUrl.cpp \
-	nsMsgTxn.cpp \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lxpcom			\
-	-lreg			\
-	-lrdfutil_s		\
-	$(NULL)
-
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in
index 0779fb9d28c..38926aa8897 100644
--- a/mozilla/mailnews/compose/build/Makefile.in
+++ b/mozilla/mailnews/compose/build/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@
@@ -39,7 +40,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		-lmozjs \
 		-ljsdom \
 		-lappcores \
diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in
index 05bd6e476c7..ce84acde941 100644
--- a/mozilla/mailnews/compose/tests/compose/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose/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,57 +13,50 @@
 # 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=TestMSGCompose
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS = \
-		test.cpp \
-		$(NULL)
+PROGRAM		= TestMSGCompose
 
-ifdef MOZ_OJI
-        JSJ_LIB = -ljsj
-endif
+CPPSRCS		= test.cpp
 
-LIBS = \
-	-lmsgbaseutil \
-        -labouturl \
-        -lfileurl \
-        -lftpurl \
-        -lgophurl \
-        -lremoturl \
-        -lhttpurl \
-        -lsockstuburl \
-        -lnetcache \
-        -lmimetype \
-        -lnetcnvts \
-        -lnetwork \
-        -lnetlib \
-        -lreg   \
-        -lxpcom \
-        -lpwcac \
-        -lmozdbm        \
-        -lxp    \
-        -lpref  \
-        -lmozjs \
-        -ljsdom \
-        -ljsurl \
-        -lsecfree \
+LIBS		= \
+		-lmsgbaseutil \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-ljsdom \
+		-ljsurl \
+		-lsecfree \
 		$(TIMER_LIBS) \
-        $(ZLIB_LIBS) \
-        $(NSPR_LIBS) \
-        -limg           \
-        -lmozutil       \
-        $(TK_LIBS) \
-        $(NULL)
-
-include $(topsrcdir)/config/config.mk
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		-limg \
+		-lmozutil \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in
index a345e1daddb..22cbdc52f32 100644
--- a/mozilla/mailnews/compose/tests/compose2/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose2/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,56 +13,49 @@
 # 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=msgcomposetest2
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS = \
-		test2.cpp \
-		$(NULL)
+PROGRAM		= msgcomposetest2
 
-ifdef MOZ_OJI
-        JSJ_LIB = -ljsj
-endif
+CPPSRCS		= test2.cpp
 
-LIBS = \
-        -labouturl \
-        -lfileurl \
-        -lftpurl \
-        -lgophurl \
-        -lremoturl \
-        -lhttpurl \
-        -lsockstuburl \
-        -lnetcache \
-        -lmimetype \
-        -lnetcnvts \
-        -lnetwork \
-        -lnetlib \
-        -lreg   \
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
 		$(TIMER_LIBS) \
-        -lxpcom \
-        -lpwcac \
-        -lmozdbm        \
-        -lxp    \
-        -lpref  \
-        -lmozjs \
-        -ljsdom \
-        -ljsurl \
-        -lsecfree \
-        $(ZLIB_LIBS) \
-        $(NSPR_LIBS) \
-        -lraptorgfx     \
-        -limg           \
-        -lmozutil       \
-        $(NULL)
-
-include $(topsrcdir)/config/config.mk
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-ljsdom \
+		-ljsurl \
+		-lsecfree \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		-lraptorgfx \
+		-limg \
+		-lmozutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in
index 5d2658b0c01..f5cae1ab4b2 100644
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -22,60 +22,58 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= geturl.cpp  \
-            nsURLFetcher.cpp  \
-            $(NULL)
-
-LOCAL_INCLUDES  =
-
-REQUIRES	= 
-
-BASE_LIBS =	     \
-	-lpref	     \
-	$(ZLIB_LIBS) \
-	-lreg	     \
-	-l$(MOZ_LIB_JS_PREFIX)js	     \
-	-lxpcom	     \
-	-lsecfree    \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NULL)
-
-GECKO_LIBS =		      \
-	-lraptorhtmlpars      \
-	-lexpat \
-	-lxmltok \
-	-ljsdom		      \
-	-lraptorplugin	      \
-	$(NULL)
-
-NETLIB_LIBS =	      \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
-	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
-	$(NULL)
-
-LIBS		= \
-	$(GECKO_LIBS) \
-	$(NETLIB_LIBS) \
-	$(TIMER_LIBS) \
-	$(BASE_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
 PROGRAM		= geturl
 
+CPPSRCS		= \
+		geturl.cpp \
+		nsURLFetcher.cpp \
+		$(NULL)
+
+BASE_LIBS	= \
+		-lpref \
+		$(ZLIB_LIBS) \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NULL)
+
+GECKO_LIBS	= \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsdom \
+		-lraptorplugin \
+		$(NULL)
+
+NETLIB_LIBS	= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lhttpurl \
+		-lremoturl \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lnetcnvts \
+		-lnetlib \
+		-lnetwork \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lpwcac \
+		$(NULL)
+
+LIBS		= \
+		$(GECKO_LIBS) \
+		$(NETLIB_LIBS) \
+		$(TIMER_LIBS) \
+		$(BASE_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
index 8395b7d4f66..8b9b4089bbc 100644
--- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendlater/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,56 +13,49 @@
 # 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=sendlatertest
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS = \
-		test.cpp \
-		$(NULL)
+PROGRAM		= sendlatertest
 
-ifdef MOZ_OJI
-        JSJ_LIB = -ljsj
-endif
+CPPSRCS		= test.cpp
 
-LIBS = \
-        -labouturl \
-        -lfileurl \
-        -lftpurl \
-        -lgophurl \
-        -lremoturl \
-        -lhttpurl \
-        -lsockstuburl \
-        -lnetcache \
-        -lmimetype \
-        -lnetcnvts \
-        -lnetwork \
-        -lnetlib \
-        -lreg   \
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
 		$(TIMER_LIBS) \
-        -lxpcom \
-        -lpwcac \
-        -lmozdbm \
-        -lxp    \
-        -lpref  \
-        -lmozjs \
-        -ljsdom \
-        -ljsurl \
-        -lsecfree \
-        $(ZLIB_LIBS) \
-        $(NSPR_LIBS) \
-        -lraptorgfx     \
-        -limg           \
-        -lmozutil       \
-        $(NULL)
-
-include $(topsrcdir)/config/config.mk
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-ljsdom \
+		-ljsurl \
+		-lsecfree \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		-lraptorgfx \
+		-limg \
+		-lmozutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in
index 2ed6766e0dd..0074e6ff663 100644
--- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendpage/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,56 +13,49 @@
 # 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=sendpage
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS = \
-		Test.cpp \
-		$(NULL)
+PROGRAM		= sendpage
 
-ifdef MOZ_OJI
-        JSJ_LIB = -ljsj
-endif
+CPPSRCS		= Test.cpp
 
-LIBS = \
-        -labouturl \
-        -lfileurl \
-        -lftpurl \
-        -lgophurl \
-        -lremoturl \
-        -lhttpurl \
-        -lsockstuburl \
-        -lnetcache \
-        -lmimetype \
-        -lnetcnvts \
-        -lnetwork \
-        -lnetlib \
-        -lreg   \
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
 		$(TIMER_LIBS) \
-        -lxpcom \
-        -lpwcac \
-        -lmozdbm \
-        -lxp    \
-        -lpref  \
-        -lmozjs \
-        -ljsdom \
-        -ljsurl \
-        -lsecfree \
-        $(ZLIB_LIBS) \
-        $(NSPR_LIBS) \
-        -lraptorgfx     \
-        -limg           \
-        -lmozutil       \
-        $(NULL)
-
-include $(topsrcdir)/config/config.mk
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-ljsdom \
+		-ljsurl \
+		-lsecfree \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		-lraptorgfx \
+		-limg \
+		-lmozutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in
index 8577eb15e86..f1035108001 100644
--- a/mozilla/mailnews/compose/tests/smtp/Makefile.in
+++ b/mozilla/mailnews/compose/tests/smtp/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,61 +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
 
-PROGRAM	= smtpTest
+PROGRAM		= smtpTest
 
-CPPSRCS = \
-	smtpTest.cpp		   \
-	$(NULL)
+CPPSRCS		= smtpTest.cpp
 
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
-	-ljsdom	\
-	-ljsurl	\
-	-limg	\
-	-lxp	\
-	-lmozutil \
-	-lsecfree \
-	$(TIMER_LIBS) \
-	$(ZLIB_LIBS) \
-	$(DIST)/lib/librdfbase_s.a \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsdom \
+		-ljsurl \
+		-limg \
+		-lxp \
+		-lmozutil \
+		-lsecfree \
+		$(TIMER_LIBS) \
+		$(ZLIB_LIBS) \
+		$(DIST)/lib/librdfbase_s.a \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/db/msgdb/src/Makefile.in b/mozilla/mailnews/db/msgdb/src/Makefile.in
index df2b1e3b845..bbf1654a0a2 100644
--- a/mozilla/mailnews/db/msgdb/src/Makefile.in
+++ b/mozilla/mailnews/db/msgdb/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,31 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = msgdb
-LIBRARY_NAME=msgdb_s
+MODULE		= msgdb
+LIBRARY_NAME	= msgdb_s
 
-EXPORTS = \
-	$(NULL)
-
-CPPSRCS = \
-	nsMsgDatabase.cpp\
-	nsDBFolderInfo.cpp\
-	nsMsgHdr.cpp\
-	nsNewsDatabase.cpp\
-	nsMailDatabase.cpp\
-	nsImapMailDatabase.cpp\
-	nsMsgThread.cpp\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	$(NSPR_LIBS)	\
-	-lxpcom		\
-	-lreg		\
-	-lmsgbaseutil	\
-	$(NULL)
+CPPSRCS		= \
+		nsMsgDatabase.cpp \
+		nsDBFolderInfo.cpp \
+		nsMsgHdr.cpp \
+		nsNewsDatabase.cpp \
+		nsMailDatabase.cpp \
+		nsImapMailDatabase.cpp \
+		nsMsgThread.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=
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in
index ad513e360f1..64a8444b827 100644
--- a/mozilla/mailnews/imap/build/Makefile.in
+++ b/mozilla/mailnews/imap/build/Makefile.in
@@ -30,20 +30,20 @@ CPPSRCS		= nsImapFactory.cpp
 EXPORTS		= nsMsgImapCID.h
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/libmsgimap_s.a \
-	$(NULL)
+		$(DIST)/lib/libmsgimap_s.a \
+		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lreg \
-	-lrdfutil_s \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lmozreg \
+		-lrdfutil_s \
+		-lmsgbaseutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in
index b779d7dcd20..9ad14867b5f 100644
--- a/mozilla/mailnews/imap/tests/harness/Makefile.in
+++ b/mozilla/mailnews/imap/tests/harness/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,23 @@
 # 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@
-MODULE		= msgimaptest
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM = testimap
+MODULE		= msgimaptest
+PROGRAM		= testimap
 
-CPPSRCS = \
-		imapProtocolTest.cpp \
-		$(NULL)
+CPPSRCS		= imapProtocolTest.cpp
 
-LIBS =	\
-		-L$(DIST)/lib			\
-		-L$(DIST)/bin			\
+LIBS		= \
+		-L$(DIST)/lib \
+		-L$(DIST)/bin \
 		-labouturl \
 		-lfileurl \
 		-lftpurl \
@@ -44,7 +42,7 @@ LIBS =	\
 		-lnetcnvts \
 		-lnetwork \
 		-lnetlib \
-		-lreg   \
+		-lmozreg \
 		-lxpcom \
 		-lpwcac \
 		-lmozdbm \
@@ -66,7 +64,5 @@ LIBS =	\
 		$(TK_LIBS) \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in
index 0b86c010f39..53fa8e3f068 100644
--- a/mozilla/mailnews/local/build/Makefile.in
+++ b/mozilla/mailnews/local/build/Makefile.in
@@ -30,20 +30,20 @@ CPPSRCS		= nsMsgLocalFactory.cpp
 EXPORTS		= nsMsgLocalCID.h
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/libmsglocal_s.a \
-	$(DIST)/lib/librdfutil_s.a \
-	$(NULL)
+		$(DIST)/lib/libmsglocal_s.a \
+		$(DIST)/lib/librdfutil_s.a \
+		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lreg \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lmozreg \
+		-lmsgbaseutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/local/tests/mailbox/Makefile.in b/mozilla/mailnews/local/tests/mailbox/Makefile.in
index d4a7dd9c066..6423c4e588b 100644
--- a/mozilla/mailnews/local/tests/mailbox/Makefile.in
+++ b/mozilla/mailnews/local/tests/mailbox/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,54 +13,49 @@
 # 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
 
-PROGRAM	= mailboxTest
+PROGRAM		= mailboxTest
 
-CPPSRCS = \
-	mailboxTest.cpp		   \
-	nsMsgMailboxParserStub.cpp \
-	$(NULL)
+CPPSRCS		= \
+		mailboxTest.cpp \
+		nsMsgMailboxParserStub.cpp \
+		$(NULL)
 
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-lmork \
-	-lmsgbaseutil \
-	-lsecfree \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-lmork \
+		-lmsgbaseutil \
+		-lsecfree \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/local/tests/mboxParser/Makefile.in b/mozilla/mailnews/local/tests/mboxParser/Makefile.in
index 019a560de94..96add91482c 100644
--- a/mozilla/mailnews/local/tests/mboxParser/Makefile.in
+++ b/mozilla/mailnews/local/tests/mboxParser/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,51 +13,43 @@
 # 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
 
-PROGRAM	= mboxParserTest
+PROGRAM		= mboxParserTest
+CPPSRCS		= mboxParserTest.cpp
 
-CPPSRCS = \
-	mboxParserTest.cpp		   \
-	$(NULL)
-
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-lsecfree \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-lsecfree \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in
index 0e25b3c1f51..d61803bffb6 100644
--- a/mozilla/mailnews/local/tests/pop3/Makefile.in
+++ b/mozilla/mailnews/local/tests/pop3/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,57 +13,49 @@
 # 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
 
-PROGRAM	= pop3Test
+PROGRAM		= pop3Test
+CPPSRCS		= pop3Test.cpp
 
-CPPSRCS = \
-	pop3Test.cpp		   \
-	$(NULL)
-
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lmsgbaseutil \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-ljsdom	\
-	-ljsurl	\
-	-lsecfree \
-	$(TIMER_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	-limg		\
-	-lmozutil	\
-	$(TK_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmsgbaseutil \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-ljsdom \
+		-ljsurl \
+		-lsecfree \
+		$(TIMER_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		-limg \
+		-lmozutil \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in
index fa9380a348b..bd131832a58 100644
--- a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/calendar/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,36 +13,34 @@
 # 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@
 
-IS_COMPONENT=1
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=calendar
-LIBRARY_NAME=calendar
+MODULE		= calendar
+LIBRARY_NAME	= calendar
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-		mimexpcom.cpp	\
-		mimecal.cpp	\
-		nsMimeContentTypeHandler.cpp	\
-		nsCalendarFactory.cpp	\
+CPPSRCS		= \
+		mimexpcom.cpp \
+		mimecal.cpp \
+		nsMimeContentTypeHandler.cpp \
+		nsCalendarFactory.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = 	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lxp			\
-	-lxpcom			\
-	-lreg			\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxp \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
index 5a37ba6ab59..73035edcbc4 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/vcard/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,38 +13,35 @@
 # 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@
 
-IS_COMPONENT=1
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=vcard
-LIBRARY_NAME=vcard
+MODULE		= vcard
+LIBRARY_NAME	= vcard
+IS_COMPONENT	= 1
 
-
-CPPSRCS = \
-    mimevcrd.cpp	\
-		mimexpcom.cpp 	\
-		nsVCard.cpp		\
-		nsVCardObj.cpp	\
-    		nsVCardFactory.cpp	\
-		nsMimeContentTypeHandler.cpp	\
+CPPSRCS		= \
+		mimevcrd.cpp \
+		mimexpcom.cpp \
+		nsVCard.cpp \
+		nsVCardObj.cpp \
+		nsVCardFactory.cpp \
+		nsMimeContentTypeHandler.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lxpcom			\
-	-lreg			\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/emitters/build/Makefile.in b/mozilla/mailnews/mime/emitters/build/Makefile.in
index 50bd5bc6540..5f7a83247c6 100644
--- a/mozilla/mailnews/mime/emitters/build/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/build/Makefile.in
@@ -40,7 +40,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mime/emitters/html/Makefile.in b/mozilla/mailnews/mime/emitters/html/Makefile.in
index d429401f018..6323290545e 100644
--- a/mozilla/mailnews/mime/emitters/html/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/html/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,33 @@
 # 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@
 
-IS_COMPONENT=1
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=htmlemitter
-LIBRARY_NAME=htmlemitter
+MODULE		= htmlemitter
+LIBRARY_NAME	= htmlemitter
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-		nsMimeEmitter.cpp	    \
-		nsEmitterFactory.cpp	\
+CPPSRCS		= \
+		nsMimeEmitter.cpp \
+		nsEmitterFactory.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS	= 	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lmozjs		\
-	-lreg    	\
-	-lxpcom         \
-	-lemitterutil   \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lmozreg \
+		-lxpcom \
+		-lemitterutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/emitters/raw/Makefile.in b/mozilla/mailnews/mime/emitters/raw/Makefile.in
index 1e6584ee2b9..06f65027d38 100644
--- a/mozilla/mailnews/mime/emitters/raw/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/raw/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,33 @@
 # 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@
 
-IS_COMPONENT=1
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=rawemitter
-LIBRARY_NAME=rawemitter
+MODULE		= rawemitter
+LIBRARY_NAME	= rawemitter
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-		nsMimeEmitter.cpp	    \
-		nsEmitterFactory.cpp	\
+CPPSRCS		= \
+		nsMimeEmitter.cpp \
+		nsEmitterFactory.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS	= 	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lmozjs		\
-	-lreg		\
-	-lxpcom		\
-	-lemitterutil	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lmozreg \
+		-lxpcom \
+		-lemitterutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/emitters/xml/Makefile.in b/mozilla/mailnews/mime/emitters/xml/Makefile.in
index 9cfad9e8e67..9bc08fbc50b 100644
--- a/mozilla/mailnews/mime/emitters/xml/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/xml/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,36 +13,33 @@
 # 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@
 
-IS_COMPONENT=1
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=xmlemitter
-LIBRARY_NAME=xmlemitter
+MODULE		= xmlemitter
+LIBRARY_NAME	= xmlemitter
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-		nsMimeEmitter.cpp	    \
-		nsEmitterFactory.cpp	\
+CPPSRCS		= \
+		nsMimeEmitter.cpp \
+		nsEmitterFactory.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS	= 	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	-lmozjs		\
-	-lreg		\
-	-lxpcom		\
-	-lemitterutil	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lmozreg \
+		-lxpcom \
+		-lemitterutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-install::
diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in
index 99bbb787cd5..4c4ac91b935 100644
--- a/mozilla/mailnews/mime/src/Makefile.in
+++ b/mozilla/mailnews/mime/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,102 +13,95 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=mime
-LIBRARY_NAME=mime
-IS_COMPONENT=1
-EXPORTS =\
-		nsMimeTypes.h		\
-		nsMimeObjectClassAccess.h		\
-		nsMimeConverter.h			\
-		mimetext.h						\
-		mimeleaf.h						\
-		mimecth.h						\
-		mimeobj.h						\
-		mimei.h							\
-		modmimee.h						\
-		mimecont.h						\
-		mimemult.h						\
-		mimemsig.h						\
-		mimehdrs.h						\
-		modmime.h						\
-		mimepbuf.h						\
-		modlmime.h						\
-		mimerosetta.h					\
-		comi18n.h					\
-		$(NULL)
+MODULE		= mime
+LIBRARY_NAME	= mime
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-    nsMimeURLUtils.cpp  \
-		nsMimeFactory.cpp	\
-		nsMimeObjectClassAccess.cpp		\
-		nsMimeConverter.cpp		\
+CSRCS		= oldi18n.c
+
+CPPSRCS		= \
+		nsMimeURLUtils.cpp \
+		nsMimeFactory.cpp \
+		nsMimeObjectClassAccess.cpp \
+		nsMimeConverter.cpp \
 		nsMimeAddress.cpp \
-		plugin_inst.cpp	\
-		mimecont.cpp	\
-		mimeebod.cpp	\
-		mimeenc.cpp		\
-		mimeeobj.cpp	\
-		mimehdrs.cpp	\
-		mimei.cpp		\
-		mimeiimg.cpp	\
-		mimeleaf.cpp	\
-		mimemalt.cpp	\
-		mimemapl.cpp	\
-		mimemdig.cpp	\
-		mimemmix.cpp	\
-		mimempar.cpp	\
-		mimemrel.cpp	\
-		mimemsg.cpp		\
-		mimemsig.cpp	\
-		mimemult.cpp	\
-		mimeobj.cpp		\
-		mimepbuf.cpp	\
-		mimesun.cpp		\
-		mimetenr.cpp	\
-		mimetext.cpp	\
-		mimethtm.cpp	\
-		mimetpla.cpp	\
-		mimetric.cpp	\
-		mimeunty.cpp	\
-		mimecth.cpp		\
-		mimebuf.cpp		\
-		mimecom.cpp		\
-		mimemoz2.cpp	\
-		comi18n.cpp		\
+		plugin_inst.cpp \
+		mimecont.cpp \
+		mimeebod.cpp \
+		mimeenc.cpp \
+		mimeeobj.cpp \
+		mimehdrs.cpp \
+		mimei.cpp \
+		mimeiimg.cpp \
+		mimeleaf.cpp \
+		mimemalt.cpp \
+		mimemapl.cpp \
+		mimemdig.cpp \
+		mimemmix.cpp \
+		mimempar.cpp \
+		mimemrel.cpp \
+		mimemsg.cpp \
+		mimemsig.cpp \
+		mimemult.cpp \
+		mimeobj.cpp \
+		mimepbuf.cpp \
+		mimesun.cpp \
+		mimetenr.cpp \
+		mimetext.cpp \
+		mimethtm.cpp \
+		mimetpla.cpp \
+		mimetric.cpp \
+		mimeunty.cpp \
+		mimecth.cpp \
+		mimebuf.cpp \
+		mimecom.cpp \
+		mimemoz2.cpp \
+		comi18n.cpp \
 		nsMimeTransition.cpp \
 		nsMsgHeaderParser.cpp \
 		nsStreamConverter.cpp \
 		nsMimeEmitter2.cpp \
 		$(NULL)
 
-CSRCS = \
-		oldi18n.c	\
+EXPORTS		= \
+		nsMimeTypes.h \
+		nsMimeObjectClassAccess.h \
+		nsMimeConverter.h \
+		mimetext.h \
+		mimeleaf.h \
+		mimecth.h \
+		mimeobj.h \
+		mimei.h \
+		modmimee.h \
+		mimecont.h \
+		mimemult.h \
+		mimemsig.h \
+		mimehdrs.h \
+		modmime.h \
+		mimepbuf.h \
+		modlmime.h \
+		mimerosetta.h \
+		comi18n.h \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS =             \
-	-L$(DIST)/bin	\
-	$(NSPR_LIBS)	\
-	-lmozjs			\
-	-lsecfree		\
-	-lxpcom			\
-	-lreg			\
-	$(NULL)
-
-#
-# THIS WILL NEED WORK AFTER WE GET A LIBMSG MORE XP-COM-afied
-#			mimedrft.c	\
-# XP-COM BRIDGES
-
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lsecfree \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
index 77ed9040f64..a9f42c01c7d 100644
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -22,65 +22,61 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= mimetest
 CPPSRCS		= mimetest.cpp
 
-LOCAL_INCLUDES  =
+BASE_LIBS	= \
+		-lpref \
+		$(ZLIB_LIBS) \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NULL)
 
-REQUIRES	= 
+GECKO_LIBS	= \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsdom \
+		-lraptorplugin \
+		$(NULL)
 
-BASE_LIBS =	     \
-	-lpref	     \
-	$(ZLIB_LIBS) \
-	-lreg	     \
-	-l$(MOZ_LIB_JS_PREFIX)js	     \
-	-lxpcom	     \
-	-lsecfree    \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NULL)
+IMGLIB_LIBS	= \
+		-limg \
+		$(JPEG_LIBS) \
+		$(PNG_LIBS) \
+		$(NULL)
 
-GECKO_LIBS =		      \
-	-lraptorhtmlpars      \
-	-lexpat \
-	-lxmltok \
-	-ljsdom		      \
-	-lraptorplugin	      \
-	$(NULL)
-
-IMGLIB_LIBS =	     \
-	-limg	     \
-	$(JPEG_LIBS) \
-	$(PNG_LIBS)  \
-	$(NULL)
-
-NETLIB_LIBS =	      \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
-	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
-	$(NULL)
+NETLIB_LIBS	= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lhttpurl \
+		-lremoturl \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lnetcnvts \
+		-lnetlib \
+		-lnetwork \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lpwcac \
+		$(NULL)
 
 LIBS		= \
-	$(GECKO_LIBS) \
-	$(NETLIB_LIBS) \
-	$(TIMER_LIBS) \
-	$(IMGLIB_LIBS) \
-	$(BASE_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-PROGRAM		= mimetest
+		$(GECKO_LIBS) \
+		$(NETLIB_LIBS) \
+		$(TIMER_LIBS) \
+		$(IMGLIB_LIBS) \
+		$(BASE_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/news/build/Makefile.in b/mozilla/mailnews/news/build/Makefile.in
index ae81d258253..006b3cd2537 100644
--- a/mozilla/mailnews/news/build/Makefile.in
+++ b/mozilla/mailnews/news/build/Makefile.in
@@ -32,15 +32,16 @@ EXPORTS		= nsMsgNewsCID.h
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgnews_s.a
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-lmozjs \
-	-lxpcom \
-	-lreg \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lxpcom \
+		-lmozreg \
+		-lmsgbaseutil \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in
index bc35e5c6042..d2f71ba3b8f 100644
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/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,55 @@
 # 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
 
-PROGRAM	= newsParserTest
+PROGRAM		= newsParserTest
+CPPSRCS		= newsParserTest.cpp
 
-CPPSRCS = \
-	newsParserTest.cpp		   \
-	$(NULL)
-
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-lsecfree \
-	-ljsdom \
-	-ljsurl \
-	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
-	-lraptorgfx \
-	-limg \
-	-lmozutil \
-	$(DIST)/lib/libmsgnews_s.a	\
-	-lmsgbaseutil \
-	$(TIMER_LIBS) \
-	-lxpcom	\
-	$(JPEG_LIBS) \
-	$(PNG_LIBS)  \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-lsecfree \
+		-ljsdom \
+		-ljsurl \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-lraptorgfx \
+		-limg \
+		-lmozutil \
+		$(DIST)/lib/libmsgnews_s.a \
+		-lmsgbaseutil \
+		$(TIMER_LIBS) \
+		-lxpcom \
+		$(JPEG_LIBS) \
+		$(PNG_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in
index 6df5f00b250..9920188734b 100644
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/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,62 +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
 
-PROGRAM	= nntpTest
+PROGRAM		= nntpTest
+CPPSRCS		= nntpTest.cpp
 
-CPPSRCS = \
-	nntpTest.cpp		   \
-	$(NULL)
-
-ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
-endif
-
-LIBS = \
-	-labouturl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lxpcom	\
-	-lpwcac \
-	-lmozdbm	\
-	-lxp	\
-	-lpref	\
-	-lmozjs	\
-	-lsecfree \
-	-lraptorhtmlpars	\
-	-lexpat \
-	-lxmltok \
-	-ljsdom	\
-	-lcaps \
-	-ljsurl	\
-	-limg	\
-	-lmozutil	\
-	-lmsgbaseutil \
-	$(TIMER_LIBS) \
-	$(ZLIB_LIBS) \
-	$(DIST)/lib/librdfbase_s.a \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lnetcache \
+		-lmimetype \
+		-lnetcnvts \
+		-lnetwork \
+		-lnetlib \
+		-lmozreg \
+		-lxpcom \
+		-lpwcac \
+		-lmozdbm \
+		-lxp \
+		-lpref \
+		-lmozjs \
+		-lsecfree \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsdom \
+		-lcaps \
+		-ljsurl \
+		-limg \
+		-lmozutil \
+		-lmsgbaseutil \
+		$(TIMER_LIBS) \
+		$(ZLIB_LIBS) \
+		$(DIST)/lib/librdfbase_s.a \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libreg/include/Makefile.in b/mozilla/modules/libreg/include/Makefile.in
index ddbdfcb9ea0..8f3d3067d95 100644
--- a/mozilla/modules/libreg/include/Makefile.in
+++ b/mozilla/modules/libreg/include/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,19 @@
 # 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@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= libreg
+MODULE		= libreg
 
-EXPORTS	= VerReg.h NSReg.h
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= VerReg.h NSReg.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index 8e4751f926d..1d8e2660b1d 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -13,60 +13,51 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-IGNORE_MANIFEST=1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			\
-	TestSocketIO.cpp 	\
-	TestSocketInput.cpp 	\
-	TestSocketTransport.cpp \
-	TestFileInput.cpp 	\
-	TestProtocols.cpp 	\
-	urltest.cpp	 	\
-	TestFileInput2.cpp 	\
-	$(NULL)
+REQUIRES	= libreg xpcom
 
-BASE_LIBS =	     		\
-	-lreg        		\
-	-l$(MOZ_LIB_JS_PREFIX)js        \
-	-lxpcom      		\
-	-lsecfree    		\
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	-lxpcom	     		\
-	$(NULL)
+CPPSRCS		= \
+		TestSocketIO.cpp \
+		TestSocketInput.cpp \
+		TestSocketTransport.cpp \
+		TestFileInput.cpp \
+		TestProtocols.cpp \
+		urltest.cpp \
+		TestFileInput2.cpp \
+		$(NULL)
 
-NETLIB_LIBS =         \
-  	-lneckoutil_s \
-	-lxp          \
-	-ljsurl       \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	$(NULL)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-LIBS =		       \
-	$(BASE_LIBS)   \
-	$(NETLIB_LIBS) \
-	$(NSPR_LIBS)   \
-	$(NULL)
-
-DEFINES		+= -DUSE_NSREG
-
-REQUIRES=libreg xpcom
+LIBS		= \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lxpcom \
+		-lneckoutil_s \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
 # hack until necko lands
 ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
+PUBLIC		= $(DEPTH)/netwerk/dist/include
 endif
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DUSE_NSREG
+
diff --git a/mozilla/network/module/tests/Makefile.in b/mozilla/network/module/tests/Makefile.in
index d57e8e16acb..61c96892537 100644
--- a/mozilla/network/module/tests/Makefile.in
+++ b/mozilla/network/module/tests/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,52 +13,48 @@
 # 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
 
-PROGRAM = nettest
+PROGRAM		= nettest
+CPPSRCS		= nettest.cpp
 
-CPPSRCS = \
-	nettest.cpp \
-	$(NULL)
+REQUIRES	= raptor netlib xpcom pref
 
-LOCAL_INCLUDES := -I$(srcdir)/../src
+LOCAL_INCLUDES	:= -I$(srcdir)/../src
 
-REQUIRES = raptor netlib xpcom reg pref
-
-LIBS = \
-	-lnetlib \
-	-labouturl \
-	-lfileurl \
-	-lremoturl \
-	-lgophurl \
-	-lnetcnvts \
-	-lsockstuburl \
-	-lftpurl \
-	-lmimetype \
-	-lpwcac \
-	-lhttpurl \
-	-lnetwork \
-	-lnetcache \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-limg \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lxp \
-	-lxpcom \
-	$(TIMER_LIBS) \
-	$(TK_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+LIBS		= \
+		-lnetlib \
+		-labouturl \
+		-lfileurl \
+		-lremoturl \
+		-lgophurl \
+		-lnetcnvts \
+		-lsockstuburl \
+		-lftpurl \
+		-lmimetype \
+		-lpwcac \
+		-lhttpurl \
+		-lnetwork \
+		-lnetcache \
+		-lpref \
+		-lsecfree \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-limg \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lxp \
+		-lxpcom \
+		$(TIMER_LIBS) \
+		$(TK_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in
index 3d6324724dd..39cb88cfab7 100644
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@@ -22,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
+
 include $(topsrcdir)/config/config.mk
 
 ifndef NECKO
@@ -30,8 +32,6 @@ else
 LIBRARY_NAME	= DebugRobot
 endif
 
-CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
-
 ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
@@ -54,10 +54,10 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-limg	\
+		-limg \
 		-lmozutil \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(ZLIB_LIBS) \
@@ -68,10 +68,9 @@ LIBS		= \
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
+
 else
-DIRS = test
+DIRS		= test
 endif
 
-
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in
index 36d7e66bd6c..7072b056109 100644
--- a/mozilla/parser/htmlparser/robot/test/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/test/Makefile.in
@@ -13,38 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
-
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-IGNORE_MANIFEST=1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			\
-	RobotMain.cpp 		\
-	$(NULL)
+PROGRAM		= htmlrobot
 
-BASE_LIBS =	     \
-	-lreg	     \
-	-lxpcom	     \
-	$(NULL)
+REQUIRES	= xpcom
 
-LIBS =		       \
-	-lDebugRobot	\
-	$(BASE_LIBS)   \
-	$(NSPR_LIBS)   \
-	$(NULL)
+CPPSRCS		= RobotMain.cpp
+
+LIBS		= \
+		-lDebugRobot \
+		-lmozreg \
+		-lxpcom \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
-REQUIRES=xpcom
-
-PROGRAM = htmlrobot
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in
index d36ca928cf5..9ded444e55a 100644
--- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in
+++ b/mozilla/parser/htmlparser/tests/logparse/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,29 +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
 
-PROGRAM = logparse
+PROGRAM		= logparse
 
-CPPSRCS		= \
-	logparse.cpp	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-LIBS = \
-	-lraptorhtmlpars \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
+CPPSRCS		= logparse.cpp
 
+LIBS		= \
+		-lraptorhtmlpars \
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/rdf/tests/localfile/Makefile.in b/mozilla/rdf/tests/localfile/Makefile.in
index c4d5274deee..96d995cb8e0 100644
--- a/mozilla/rdf/tests/localfile/Makefile.in
+++ b/mozilla/rdf/tests/localfile/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -22,18 +22,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= localfile
 CPPSRCS		= localfile.cpp
 
-LOCAL_INCLUDES = 
-
-REQUIRES	= 
-
 LIBS		= \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM		= localfile
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in
index 789031215ba..9cf4017055c 100644
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -22,59 +22,54 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= rdfcat
 CPPSRCS		= rdfcat.cpp
 
-LOCAL_INCLUDES  =
-
-REQUIRES	= 
-
-BASE_LIBS =	     \
-	-lpref	     \
-	$(ZLIB_LIBS) \
-	-lreg	     \
-	-l$(MOZ_LIB_JS_PREFIX)js	     \
-	-lxpcom	     \
-	-lsecfree    \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NULL)
+BASE_LIBS	= \
+		-lpref \
+		$(ZLIB_LIBS) \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NULL)
 
 ifndef NECKO
-
-NETLIB_LIBS =	      \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
-	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
-	$(NULL)
+NETLIB_LIBS	= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lhttpurl \
+		-lremoturl \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lnetcnvts \
+		-lnetlib \
+		-lnetwork \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lpwcac \
+		$(NULL)
 else
-NETLIB_LIBS =	      \
-	-lneckoutil_s \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	$(NULL)
+NETLIB_LIBS	= \
+		-lneckoutil_s \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		$(NULL)
 endif
 
 LIBS		= \
-	$(NETLIB_LIBS) \
-	$(TIMER_LIBS) \
-	$(BASE_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-PROGRAM		= rdfcat
+		$(NETLIB_LIBS) \
+		$(TIMER_LIBS) \
+		$(BASE_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in
index aebc6ee3f05..41ab7045f3c 100644
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -22,60 +22,55 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= rdfpoll
 CPPSRCS		= rdfpoll.cpp
 
-LOCAL_INCLUDES  =
-
-REQUIRES	= 
-
-BASE_LIBS =	     \
-	-lpref	     \
-	$(ZLIB_LIBS) \
-	-lreg	     \
-	-l$(MOZ_LIB_JS_PREFIX)js	     \
-	-lxpcom	     \
-	-lsecfree    \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NULL)
+BASE_LIBS	= \
+		-lpref \
+		$(ZLIB_LIBS) \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lxpcom \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NULL)
 
 ifndef NECKO
-
-NETLIB_LIBS =	      \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
-	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
-	$(NULL)
+NETLIB_LIBS	= \
+		-labouturl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lhttpurl \
+		-lremoturl \
+		-lsockstuburl \
+		-lmimetype \
+		-lnetcache \
+		-lnetcnvts \
+		-lnetlib \
+		-lnetwork \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lpwcac \
+		$(NULL)
 else
-NETLIB_LIBS =	      \
-	-lneckoutil_s \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	$(NULL)
+NETLIB_LIBS	= \
+		-lneckoutil_s \
+		-lxp \
+		-ljsurl \
+		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		$(NULL)
 endif
 
 LIBS		= \
-	$(NETLIB_LIBS) \
-	$(TIMER_LIBS) \
-	$(IMGLIB_LIBS) \
-	$(BASE_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-PROGRAM		= rdfpoll
+		$(NETLIB_LIBS) \
+		$(TIMER_LIBS) \
+		$(IMGLIB_LIBS) \
+		$(BASE_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/rdf/tests/rdfsink/Makefile.in b/mozilla/rdf/tests/rdfsink/Makefile.in
index 63342c7d50d..1e2340cdad0 100644
--- a/mozilla/rdf/tests/rdfsink/Makefile.in
+++ b/mozilla/rdf/tests/rdfsink/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -22,18 +22,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= rdfsink
 CPPSRCS		= rdfsink.cpp
 
-LOCAL_INCLUDES  =
-
-REQUIRES	= 
-
 LIBS		= \
-	-lxpcom \
-	-lreg \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM		= rdfsink
+		-lxpcom \
+		-lmozreg \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in
index 0231e25c29b..8395e9c0c53 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.in
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.in
@@ -96,7 +96,7 @@ MOZ_LIB_UTIL_PREFIX = moz
 
 ZLIB_LIBS = -lz
 
-BASE_LIBS =          -lpref               $(ZLIB_LIBS)         -lreg                -l$(MOZ_LIB_JS_PREFIX)js             		-ltimer_s         -lxpcom              -lsecfree            -l$(MOZ_LIB_UTIL_PREFIX)util            $(NULL)
+BASE_LIBS =          -lpref               $(ZLIB_LIBS)         -lmozreg                -l$(MOZ_LIB_JS_PREFIX)js             		-ltimer_s         -lxpcom              -lsecfree            -l$(MOZ_LIB_UTIL_PREFIX)util            $(NULL)
 
 
 MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidget_gtk
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index e4ece92fadb..a5fa22910b7 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/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,166 +13,149 @@
 # 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	= public
+DIRS			= public
 
-PROGRAM	= viewer
+PROGRAM			= viewer
 
-EXPORT_RESOURCE_SAMPLES := \
-	$(wildcard $(srcdir)/samples/test*.html) \
-	$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
-	$(wildcard $(srcdir)/samples/treeTest*.xul) \
-	$(wildcard $(srcdir)/samples/treeTest*.css) \
-	$(wildcard $(srcdir)/samples/xulTest.css) \
-	$(wildcard $(srcdir)/samples/aform.css) \
-	$(wildcard $(srcdir)/samples/bform.css) \
-	$(wildcard $(srcdir)/samples/cform.css) \
-	$(wildcard $(srcdir)/samples/mozform.css) \
-	$(wildcard $(srcdir)/samples/demoform.css) \
-	$(wildcard $(srcdir)/samples/slider*.xul) \
-	$(wildcard $(srcdir)/samples/scrollbar*.xul) \
-	$(srcdir)/resources/find.html \
-	$(srcdir)/resources/printsetup.html \
-	$(srcdir)/resources/image_props.html \
-	$(srcdir)/samples/raptor.jpg \
-	$(srcdir)/samples/Anieyes.gif \
-	$(srcdir)/samples/gear1.gif \
-	$(srcdir)/samples/rock_gra.gif \
-	$(srcdir)/samples/bg.jpg \
-	$(srcdir)/samples/checkboxTest.xul \
-	$(srcdir)/samples/beeptest.html \
-	$(srcdir)/samples/soundtest.html \
-	$(srcdir)/samples/test.wav \
-	$(NULL)
+RUN_VIEWER_SCRIPT	= $(srcdir)/mozilla-viewer.sh
 
-EXPORT_RESOURCE_THROBBER := \
-	$(wildcard $(srcdir)/throbber/anim*.gif) \
-	$(NULL)
+CPPSRCS			= \
+			$(TOOLKIT_CPPSRCS) \
+			nsBaseDialog.cpp \
+			nsFindDialog.cpp \
+			nsXPBaseWindow.cpp \
+			nsTableInspectorDialog.cpp \
+			nsImageInspectorDialog.cpp \
+			nsPrintSetupDialog.cpp \
+			nsBrowserWindow.cpp \
+			nsEditorMode.cpp \
+			nsSetupRegistry.cpp \
+			nsViewerApp.cpp \
+			nsWebCrawler.cpp \
+			$(NULL)
 
-TOOLKIT_CPPSRCS_beos := \
-	nsBeOSMain.cpp
+EXPORT_RESOURCE_SAMPLES	:= \
+			$(wildcard $(srcdir)/samples/test*.html) \
+			$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.css) \
+			$(wildcard $(srcdir)/samples/slider*.xul) \
+			$(wildcard $(srcdir)/samples/scrollbar*.xul) \
+			$(srcdir)/resources/find.html \
+			$(srcdir)/resources/printsetup.html \
+			$(srcdir)/resources/image_props.html \
+			$(srcdir)/samples/aform.css \
+			$(srcdir)/samples/bform.css \
+			$(srcdir)/samples/cform.css \
+			$(srcdir)/samples/demoform.css \
+			$(srcdir)/samples/mozform.css \
+			$(srcdir)/samples/xulTest.css \
+			$(srcdir)/samples/Anieyes.gif \
+			$(srcdir)/samples/gear1.gif \
+			$(srcdir)/samples/rock_gra.gif \
+			$(srcdir)/samples/beeptest.html \
+			$(srcdir)/samples/soundtest.html \
+			$(srcdir)/samples/bg.jpg \
+			$(srcdir)/samples/raptor.jpg \
+			$(srcdir)/samples/test.wav \
+			$(srcdir)/samples/checkboxTest.xul \
+			$(NULL)
 
-TOOLKIT_CPPSRCS_gtk := \
-	nsGTKMain.cpp \
-	nsGTKMenu.cpp
-
-TOOLKIT_CPPSRCS_motif := \
-	nsMotifMenu.cpp \
-	nsMotifMain.cpp
-
-TOOLKIT_CPPSRCS_photon := \
-	nsPhMain.cpp \
-	nsPhMenu.cpp
-
-TOOLKIT_CPPSRCS_xlib := \
-	nsXlibMain.cpp
+EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)
 
+TOOLKIT_CPPSRCS_beos	:= nsBeOSMain.cpp
+TOOLKIT_CPPSRCS_gtk	:= nsGTKMain.cpp nsGTKMenu.cpp
+TOOLKIT_CPPSRCS_motif	:= nsMotifMenu.cpp nsMotifMain.cpp
+TOOLKIT_CPPSRCS_photon	:= nsPhMain.cpp nsPhMenu.cpp
+TOOLKIT_CPPSRCS_xlib	:= nsXlibMain.cpp
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-BEOS_PROGRAM_RESOURCE = $(srcdir)/viewer-beos.rsrc
+BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
 endif
 
-TOOLKIT_CPPSRCS := $(TOOLKIT_CPPSRCS_$(MOZ_WIDGET_TOOLKIT))
-
-
-CPPSRCS =			   \
-	$(TOOLKIT_CPPSRCS)	   \
-	nsBaseDialog.cpp	   \
-	nsFindDialog.cpp	   \
-	nsXPBaseWindow.cpp	   \
-	nsTableInspectorDialog.cpp \
-	nsImageInspectorDialog.cpp \
-	nsPrintSetupDialog.cpp	   \
-	nsBrowserWindow.cpp	   \
-	nsEditorMode.cpp	   \
-	nsSetupRegistry.cpp	   \
-	nsViewerApp.cpp		   \
-	nsWebCrawler.cpp	   \
-	$(NULL)
+TOOLKIT_CPPSRCS		:= $(TOOLKIT_CPPSRCS_$(MOZ_WIDGET_TOOLKIT))
 
 ifdef MOZ_OJI
-	JSJ_LIB = -ljsj
+JSJ_LIB			= -ljsj
 endif
 
-BASE_LIBS =	     \
-	-lpref	     \
-	$(ZLIB_LIBS) \
-	-lreg	     \
-	-l$(MOZ_LIB_JS_PREFIX)js	     \
-	-lxpcom	     \
-	-lsecfree    \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NULL)
+BASE_LIBS		= \
+			-lpref \
+			$(ZLIB_LIBS) \
+			-lmozreg \
+			-l$(MOZ_LIB_JS_PREFIX)js \
+			-lxpcom \
+			-lsecfree \
+			-l$(MOZ_LIB_UTIL_PREFIX)util \
+			$(NULL)
 
-GECKO_LIBS =			\
-	-lraptorwebwidget	\
-	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-	-lraptorgfx		\
-	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-	$(TIMER_LIBS) \
-	-lraptorhtmlpars	\
-	-lexpat			\
-	-lxmltok		\
-	-ljsdom			\
-	-lcaps          \
-	$(NULL)
+GECKO_LIBS		= \
+			-lraptorwebwidget \
+			$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+			-lraptorgfx \
+			$(MOZ_GFX_TOOLKIT_LDFLAGS) \
+			$(TIMER_LIBS) \
+			-lraptorhtmlpars \
+			-lexpat \
+			-lxmltok \
+			-ljsdom \
+			-lcaps \
+			$(NULL)
 
-IMGLIB_LIBS =	     \
-	-limg	     \
-	$(NULL)
+IMGLIB_LIBS		= \
+			-limg \
+			$(NULL)
 
 ifndef NECKO
-NETLIB_LIBS =	      \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
-	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
-	$(NULL)
+NETLIB_LIBS		= \
+			-labouturl \
+			-lfileurl \
+			-lftpurl \
+			-lgophurl \
+			-lhttpurl \
+			-lremoturl \
+			-lsockstuburl \
+			-lmimetype \
+			-lnetcache \
+			-lnetcnvts \
+			-lnetlib \
+			-lnetwork \
+			-lxp \
+			-ljsurl \
+			-l$(MOZ_LIB_DBM_PREFIX)dbm \
+			-lpwcac \
+			$(NULL)
 else
-NETLIB_LIBS =	      \
-	-lneckoutil_s \
-	-lxp	      \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	$(NULL)
+NETLIB_LIBS		= \
+			-lneckoutil_s \
+			-lxp \
+			-ljsurl \
+			-l$(MOZ_LIB_DBM_PREFIX)dbm \
+			$(NULL)
 endif
 
-LIBS =		       \
-	$(GECKO_LIBS)  \
-	$(NETLIB_LIBS) \
-	$(IMGLIB_LIBS) \
-	$(BASE_LIBS)   \
-	$(JSJ_LIB)     \
-	$(NSPR_LIBS)   \
-	$(TK_LIBS)     \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+LIBS			= \
+			$(GECKO_LIBS) \
+			$(NETLIB_LIBS) \
+			$(IMGLIB_LIBS) \
+			$(BASE_LIBS) \
+			$(JSJ_LIB) \
+			$(NSPR_LIBS) \
+			$(TK_LIBS) \
+			$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-RUN_VIEWER_SCRIPT= $(srcdir)/mozilla-viewer.sh
+CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 install:: $(PROGRAM) $(RUN_VIEWER_SCRIPT)
 	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
diff --git a/mozilla/widget/src/rhapsody/Makefile.in b/mozilla/widget/src/rhapsody/Makefile.in
index 6bc21a15504..147d952c98b 100644
--- a/mozilla/widget/src/rhapsody/Makefile.in
+++ b/mozilla/widget/src/rhapsody/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,64 +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
+LIBRARY_NAME	= widgetunix
+MODULE		= widget
 
-LIBRARY_NAME = widgetunix
+REQUIRES	= util img xpcom raptor netlib
 
-MODULE=widget
-
-REQUIRES=util img xpcom raptor netlib
-
-DEFINES += -D_IMPL_NS_WIDGET 
-
-EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lreg $(NSPR_LIBS)
-
-CPPSRCS= \
-	nsObject.cpp \
-	$(NULL)
-
-#########################################
-# Here's what unix/Motif had as of 9/18:
-#########################################
-#       nsWidgetSupport.cpp
-#	nsWindow.cpp
-#	nsComboBox.cpp
-#	nsTextHelper.cpp
-#	nsTextAreaWidget.cpp
-#	nsTextWidget.cpp
-#	nsListBox.cpp
-#	nsRadioButton.cpp
-#	nsFileWidget.cpp
-#	nsCheckButton.cpp
-#	nsScrollbar.cpp
-#	nsButton.cpp
-#	nsAppShell.cpp
-#	nsWidgetFactory.cpp
-#	nsXtEventHandler.cpp
-#	nsLookAndFeel.cpp
-#	nsToolkit.cpp
-#	nsLabel.cpp
-#	nsDialog.cpp
-#       nsXtManageWidget.cpp
-
-include $(topsrcdir)/config/config.mk
-
-TARGETS = $(LIBRARY)
+CPPSRCS		= nsObject.cpp
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_WIDGET
 
-
-
-
-
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lmozreg $(NSPR_LIBS)
 
diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index 036748bc1e3..fdc62a99d8f 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -21,65 +21,63 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= scribble
+
+CPPSRCS		= \
+		Scribble.cpp \
+		main.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 
-PROGRAM = scribble
-
-CPPSRCS = \
-	Scribble.cpp    \
-	main.cpp	\
-	$(NULL)
-
 ifndef NECKO
-NET_LIBS = 	\
-	-lnetlib \
-	-lremoturl \
-	-lnetcnvts \
-	-lgophurl \
-	-labouturl \
-	-lsockstuburl \
-	-lhttpurl \
-	-lmimetype \
-	-lfileurl \
-	-lftpurl \
-	-lpwcac \
-	-lnetwork \
-	-lnetcache \
-	$(NULL)
-
+NET_LIBS	= \
+		-lnetlib \
+		-lremoturl \
+		-lnetcnvts \
+		-lgophurl \
+		-labouturl \
+		-lsockstuburl \
+		-lhttpurl \
+		-lmimetype \
+		-lfileurl \
+		-lftpurl \
+		-lpwcac \
+		-lnetwork \
+		-lnetcache \
+		$(NULL)
 else
-NET_LIBS = 	\
-	-lneckoutil_s \
-	$(NULL)
+NET_LIBS	= -lneckoutil_s
 endif
 
-LIBS = \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-limg \
-	$(PNG_LIBS) \
-	$(JPEG_LIBS) \
-	-lxpcom \
-	-lreg \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-	-lraptorgfx \
-	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-	$(TIMER_LIBS) \
-	-lxp \
-	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
-	-ljsurl \
-	-ljsdom \
-	$(NET_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+LIBS		= \
+		-lpref \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-limg \
+		$(PNG_LIBS) \
+		$(JPEG_LIBS) \
+		-lxpcom \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+		-lraptorgfx \
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
+		$(TIMER_LIBS) \
+		-lxp \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsurl \
+		-ljsdom \
+		$(NET_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+
diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in
index 75d1f6e85b2..b65f9f0faff 100644
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@@ -21,65 +21,63 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= widget
+
+CPPSRCS		= \
+		main.cpp \
+		nsWidgetTest.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 
-PROGRAM = widget
-
-CPPSRCS = \
-	main.cpp	 \
-	nsWidgetTest.cpp \
-	$(NULL)
-
 ifndef NECKO
-NET_LIBS = 	\
-	-lnetlib \
-	-lremoturl \
-	-lnetcnvts \
-	-lgophurl \
-	-labouturl \
-	-lsockstuburl \
-	-lhttpurl \
-	-lmimetype \
-	-lfileurl \
-	-lftpurl \
-	-lpwcac \
-	-lnetwork \
-	-lnetcache \
-	$(NULL)
-
+NET_LIBS	= \
+		-lnetlib \
+		-lremoturl \
+		-lnetcnvts \
+		-lgophurl \
+		-labouturl \
+		-lsockstuburl \
+		-lhttpurl \
+		-lmimetype \
+		-lfileurl \
+		-lftpurl \
+		-lpwcac \
+		-lnetwork \
+		-lnetcache \
+		$(NULL)
 else
-NET_LIBS = 	\
-	-lneckoutil_s \
-	$(NULL)
+NET_LIBS	= -lneckoutil_s
 endif
 
-LIBS = \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-limg \
-	$(PNG_LIBS) \
-	$(JPEG_LIBS) \
-	-lxpcom \
-	-lreg \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-	-lraptorgfx \
-	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-	$(TIMER_LIBS) \
-	-lxp \
-	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
-	-ljsurl \
-	-ljsdom \
-	$(NET_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(TK_LIBS) \
-	$(NULL)
-
-CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+LIBS		= \
+		-lpref \
+		-lsecfree \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-limg \
+		$(PNG_LIBS) \
+		$(JPEG_LIBS) \
+		-lxpcom \
+		-lmozreg \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+		-lraptorgfx \
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
+		$(TIMER_LIBS) \
+		-lxp \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsurl \
+		-ljsdom \
+		$(NET_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+
diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in
index 0fbee7c874f..2671c37766b 100644
--- a/mozilla/xpcom/build/Makefile.in
+++ b/mozilla/xpcom/build/Makefile.in
@@ -29,6 +29,20 @@ CPPSRCS		= nsXPComInit.cpp
 
 REQUIRES	= xpcom
 
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libxpcomds_s.a \
+		$(DIST)/lib/libxpcomio_s.a \
+		$(DIST)/lib/libxpcomcomponents_s.a \
+		$(DIST)/lib/libxpcomthreads_s.a \
+		$(DIST)/lib/libxpcomproxy_s.a \
+		$(DIST)/lib/libxpcombase_s.a \
+		$(DIST)/lib/libxptcall.a \
+		$(DIST)/lib/libxptinfo.a \
+		$(DIST)/lib/libxpt.a \
+		$(DIST)/lib/libxptcmd.a \
+		$(DIST)/lib/libmozreg.a \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES	+= \
@@ -42,20 +56,6 @@ LOCAL_INCLUDES	+= \
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
 
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libxpcomds_s.a \
-		$(DIST)/lib/libxpcomio_s.a \
-		$(DIST)/lib/libxpcomcomponents_s.a \
-		$(DIST)/lib/libxpcomthreads_s.a \
-		$(DIST)/lib/libxpcomproxy_s.a \
-		$(DIST)/lib/libxpcombase_s.a \
-		$(DIST)/lib/libxptcall.a \
-		$(DIST)/lib/libxptinfo.a \
-		$(DIST)/lib/libxpt.a \
-		$(DIST)/lib/libxptcmd.a \
-		$(DIST)/lib/libreg.a \
-		$(NULL)
-
 ifeq ($(OS_ARCH),HP-UX)
 EXTRA_DSO_LDOPTS = -c objs/objslist
 else
diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in
index 609b8751018..63dc665aaf2 100644
--- a/mozilla/xpcom/components/Makefile.in
+++ b/mozilla/xpcom/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,55 +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
+LIBRARY_NAME	= xpcomcomponents_s
 
-LIBRARY_NAME = xpcomcomponents_s
+CPPSRCS		= \
+		nsComponentManager.cpp \
+		nsGenericFactory.cpp \
+		nsRegistry.cpp \
+		nsRepository.cpp \
+		nsServiceManager.cpp \
+		xcDll.cpp \
+		$(NULL)
 
-MODULE = xpcom
+EXPORTS		= \
+		nsIComponentManager.h \
+		nsIFactory.h \
+		nsIGenericFactory.h \
+		nsIRegistry.h \
+		nsIServiceManager.h \
+		nsIServiceProvider.h \
+		nsRepository.h \
+		nsXPComFactory.h \
+		$(NULL)
 
-XPIDLSRCS =               \
-	$(NULL)
-
-CPPSRCS =				\
-        nsComponentManager.cpp \
-        nsGenericFactory.cpp   \
-        nsRegistry.cpp         \
-        nsRepository.cpp       \
-        nsServiceManager.cpp   \
-        xcDll.cpp              \
-	$(NULL)
-
-EXPORTS = \
-        nsIComponentManager.h \
-        nsIFactory.h          \
-        nsIGenericFactory.h   \
-        nsIRegistry.h         \
-        nsIServiceManager.h   \
-        nsIServiceProvider.h  \
-        nsRepository.h        \
-        nsXPComFactory.h      \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-DEFINES += -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-REQUIRES = xpcom libreg
-
-LOCAL_INCLUDES += 		\
-	-I$(srcdir)/../base	\
-	-I$(srcdir)/../thread	\
-	$(NULL)
-
-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
@@ -70,3 +53,10 @@ 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)
+
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 608d9a966ff..0049a360b9b 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -20,72 +20,68 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
 PROGRAM		= apprunner
 MODULE		= apprunner
 
-include $(DEPTH)/config/autoconf.mk
+CPPSRCS		= \
+		nsAppRunner.cpp \
+		nsSetupRegistry.cpp \
+		$(NULL)
+
+ifndef NECKO
+LIBS		= \
+		-labouturl \
+		-lhttpurl \
+		-lsockstuburl \
+		-lfileurl \
+		-lgophurl \
+		-lftpurl \
+		-lremoturl \
+		-lxp \
+		-lnetcache \
+		-lnetcnvts \
+		-lmimetype \
+		-lnetwork \
+		-lnetlib \
+		-lpwcac \
+		$(NULL)
+else
+LIBS		= -lneckoutil_s
+endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
 endif
 
-ifndef NECKO
-LIBS = 		\
-	-labouturl	\
-	-lhttpurl	\
-	-lsockstuburl 	\
-	-lfileurl	\
-	-lgophurl	\
-	-lftpurl	\
-	-lremoturl	\
-	-lxp		\
-	-lnetcache	\
-	-lnetcnvts	\
-	-lmimetype	\
-	-lnetwork	\
-	-lnetlib	\
-	-lpwcac		\
-	$(NULL)
-else
-LIBS = 		\
-	-lneckoutil_s	\
-	$(NULL)
-endif
-
-LIBS += \
-	-L$(DIST)/bin	\
-	-lnsappshell	\
-	-lxpcom		\
-	$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-	-lraptorgfx	\
-	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-	$(TIMER_LIBS) \
-	-lreg		\
-	-lraptorwebwidget	\
-	-lraptorhtmlpars	\
-	-lexpat \
-	-lxmltok \
-	-ljsdom		\
-	-lcaps      \
-	-ljsurl		\
-	-lsecfree	\
-	-l$(MOZ_LIB_JS_PREFIX)js		\
-	$(JSJ_LIB)	\
-	-lpref		\
-	-limg		\
-	-l$(MOZ_LIB_UTIL_PREFIX)util	\
-	-lxp		\
-	-lxpcom		\
-	$(ZLIB_LIBS)	\
-	$(NSPR_LIBS)	\
-	$(TK_LIBS)	\
-	$(NULL)
-
-
-CPPSRCS = \
-	nsAppRunner.cpp 	\
-	nsSetupRegistry.cpp	\
-	$(NULL)
+LIBS		+= \
+		-lnsappshell \
+		-lxpcom \
+		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
+		-lraptorgfx \
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
+		$(TIMER_LIBS) \
+		-lmozreg \
+		-lraptorwebwidget \
+		-lraptorhtmlpars \
+		-lexpat \
+		-lxmltok \
+		-ljsdom \
+		-lcaps \
+		-ljsurl \
+		-lsecfree \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		$(JSJ_LIB) \
+		-lpref \
+		-limg \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lxp \
+		-lxpcom \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
@@ -93,3 +89,4 @@ CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 install:: $(srcdir)/mozilla-apprunner.sh
 	$(INSTALL) $< $(DIST)/bin
+
diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in
index 7be54421fa2..799aeeab3fb 100644
--- a/mozilla/xpfe/components/find/src/Makefile.in
+++ b/mozilla/xpfe/components/find/src/Makefile.in
@@ -26,24 +26,21 @@ MODULE		= mozfind
 LIBRARY_NAME	= mozfind
 IS_COMPONENT	= 1
 
-CPPSRCS		= \
-		nsFindComponent.cpp \
-		$(NULL)
+CPPSRCS		= nsFindComponent.cpp
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin	\
-		-L$(DIST)/lib	\
-		-lxpcom			\
-		-lreg			\
-		$(ZLIB_LIBS)	\
-		$(NSPR_LIBS)	\
-		-l$(MOZ_LIB_JS_PREFIX)js	\
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lmozreg \
+		$(ZLIB_LIBS) \
+		-l$(MOZ_LIB_JS_PREFIX)js \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 ifndef NECKO
-EXTRA_DSO_LDOPTS += \
-		-lnetlib 	\
-		$(NULL)
+EXTRA_DSO_LDOPTS += -lnetlib
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/prefwindow/src/Makefile.in b/mozilla/xpfe/components/prefwindow/src/Makefile.in
index 383ce9e6803..f1aa80f634f 100644
--- a/mozilla/xpfe/components/prefwindow/src/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/src/Makefile.in
@@ -35,15 +35,14 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 ifndef NECKO
-EXTRA_DSO_LDOPTS += \
-		-lnetlib \
-		$(NULL)
+EXTRA_DSO_LDOPTS += -lnetlib
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/sample/src/Makefile.in b/mozilla/xpfe/components/sample/src/Makefile.in
index e5a866d4932..33f22c47734 100644
--- a/mozilla/xpfe/components/sample/src/Makefile.in
+++ b/mozilla/xpfe/components/sample/src/Makefile.in
@@ -32,10 +32,11 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		-lnetlib \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in
index 32193144b86..70d2a2e2089 100644
--- a/mozilla/xpfe/components/ucth/src/Makefile.in
+++ b/mozilla/xpfe/components/ucth/src/Makefile.in
@@ -32,16 +32,15 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		-l$(MOZ_LIB_JS_PREFIX)js	\
 		$(NULL)
 
 ifndef NECKO
-EXTRA_DSO_LDOPTS += \
-		-lnetlib 	\
-		$(NULL)
+EXTRA_DSO_LDOPTS += -lnetlib
 endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in
index fb647a568bc..51de5bd303f 100644
--- a/mozilla/xpfe/components/xfer/src/Makefile.in
+++ b/mozilla/xpfe/components/xfer/src/Makefile.in
@@ -35,21 +35,16 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lreg \
+		-lmozreg \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 ifdef NECKO
-SHARED_LIBRARY_LIBS= \
-	$(DIST)/lib/libneckoutil_s.a \
-	$(NULL)
-endif
-
-ifndef NECKO
-EXTRA_DSO_LDOPTS += \
-		-lnetlib \
-		$(NULL)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libneckoutil_s.a
+else
+EXTRA_DSO_LDOPTS += -lnetlib
 endif
 
 include $(topsrcdir)/config/rules.mk
+