diff --git a/mozilla/dbm/src/Makefile.in b/mozilla/dbm/src/Makefile.in
index f44c554090e..26e76b014e6 100644
--- a/mozilla/dbm/src/Makefile.in
+++ b/mozilla/dbm/src/Makefile.in
@@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
-LIBRARY_NAME	= $(MOZ_LIB_DBM_PREFIX)dbm
+LIBRARY_NAME	= mozdbm
 
 LIB_IS_C_ONLY	= 1
 
diff --git a/mozilla/dbm/tests/Makefile.in b/mozilla/dbm/tests/Makefile.in
index 8fe4ea51340..2d8b5a44a05 100644
--- a/mozilla/dbm/tests/Makefile.in
+++ b/mozilla/dbm/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@
@@ -24,15 +24,11 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
 
-CSRCS		= lots.c
-
 PROGRAM		= lots
 
-#REQUIRES	= $(MOZ_LIB_DBM_PREFIX)dbm
+CSRCS		= lots.c
 
-LIBS		= \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm \
-	$(NULL)
+LIBS		= -lmozdbm
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in
index 10d449d2405..d4b16b4d4c1 100644
--- a/mozilla/gfx/tests/Makefile.in
+++ b/mozilla/gfx/tests/Makefile.in
@@ -59,12 +59,12 @@ LIBS		= \
 		-lxpcom \
 		-lmozreg \
 		-lpref \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lsecfree \
 		-limg \
 		$(JPEG_LIBS) \
 		$(PNG_LIBS) \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-lxp \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in
index 39cb88cfab7..975f6faa632 100644
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@@ -53,7 +53,7 @@ LIBS		= \
 		-lnetcache \
 		-lhttpurl \
 		-lpwcac \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-limg \
 		-lmozutil \
 		-lxpcom \
diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in
index 5bfb71636af..908fce9dde3 100644
--- a/mozilla/intl/strres/tests/Makefile.in
+++ b/mozilla/intl/strres/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,65 +24,60 @@ include $(DEPTH)/config/autoconf.mk
 
 CPPSRCS		= StringBundleTest.cpp
 
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+
+EXPORT_RESOURCE	= \
+		$(srcdir)/strres.properties \
+		$(srcdir)/strres-test.html \
+		$(srcdir)/strres-test.xul \
+		$(srcdir)/strres-test.dtd \
+		$(srcdir)/strres-test.js \
+		$(NULL)
+
+EXPORT_GLOBAL_RESOURCE = $(srcdir)/strres.js
+
 ifndef NECKO
-NETLIB_LIBS = 	\
-	-lnetlib \
-	-labouturl \
-	-lfileurl \
-	-lremoturl \
-	-lgophurl \
-	-lnetcnvts \
-	-lsockstuburl \
-	-lftpurl \
-	-lmimetype \
-	-lpwcac \
-	-lhttpurl \
-	-lnetwork \
-	-lnetcache \
-	$(NULL)
+NETLIB_LIBS	= \
+		-lnetlib \
+		-labouturl \
+		-lfileurl \
+		-lremoturl \
+		-lgophurl \
+		-lnetcnvts \
+		-lsockstuburl \
+		-lftpurl \
+		-lmimetype \
+		-lpwcac \
+		-lhttpurl \
+		-lnetwork \
+		-lnetcache \
+		$(NULL)
 else
-NETLIB_LIBS = 	\
-	-lneckoutil_s \
-	$(NULL)
+NETLIB_LIBS	= -lneckoutil_s
 endif
 
-LIBS		=\
-	-lraptorgfx 	\
-	$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-	$(TK_LIBS) \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-limg \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lxp \
-	-lxpcom		\
-	$(NETLIB_LIBS) \
-	$(TIMER_LIBS) \
-	$(ZLIB_LIBS)	\
-	$(NSPR_LIBS)	\
-	$(NULL)		
-
-SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
+LIBS		= \
+		-lraptorgfx \
+		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
+		$(TK_LIBS) \
+		-lpref \
+		-lsecfree \
+		-lmozjs \
+		-limg \
+		-lmozutil \
+		-lxp \
+		-lxpcom \
+		$(NETLIB_LIBS) \
+		$(TIMER_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../src
 
-EXPORT_RESOURCE = \
-	$(srcdir)/strres.properties \
-	$(srcdir)/strres-test.html \
-	$(srcdir)/strres-test.xul \
-	$(srcdir)/strres-test.dtd\
-	$(srcdir)/strres-test.js \
-	$(NULL)
-
-EXPORT_GLOBAL_RESOURCE = \
-	$(srcdir)/strres.js \
-	$(NULL)
-
 install::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
 	$(INSTALL) $(EXPORT_GLOBAL_RESOURCE) $(DIST)/bin/chrome/global/content/default
 
-
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index ef26d809712..1b5e0dbf758 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -25,35 +25,12 @@ JSMATH_PRELINK	= jsmathtemp.o
 JS_SAFE_ARENA	= 1
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME	= $(MOZ_LIB_JS_PREFIX)js
+LIBRARY_NAME	= mozjs
 MODULE		= js
 
 SIMPLE_PROGRAMS	= jscpucfg
 
-ifdef MOZ_OJI
-DIRS		= liveconnect
-endif
-
-DIRS		+= fdlibm xpconnect
-
-DEFINES     += -DEXPORT_JS_API
-
-GARBAGE		+= $(JSMATH_PRELINK) $(OBJDIR)/jscpucfg.o $(OBJDIR)/jsautocfg.h $(OBJDIR)/jsautocfg.tmp
-
-ifeq ($(OS_ARCH),OS2)
-ifndef XCFLAGS
-OS2_IMPLIB	= 1
-LIBRARY		= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
-DEF_FILE	= jsos2$(VERSION_NUMBER).def
-EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA)
-else
-EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
-endif
-OS_CFLAGS	+= -tm-
-endif
-
 CSRCS		= jsapi.c \
 		  jsarena.c \
 		  jsarray.c \
@@ -132,6 +109,26 @@ EXPORTS		= js.msg \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
+ifdef MOZ_OJI
+DIRS		= liveconnect
+endif
+
+DIRS		+= fdlibm xpconnect
+
+include $(topsrcdir)/config/config.mk
+
+ifeq ($(OS_ARCH),OS2)
+ifndef XCFLAGS
+OS2_IMPLIB	= 1
+LIBRARY		= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+DEF_FILE	= jsos2$(VERSION_NUMBER).def
+EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA)
+else
+EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
+endif
+OS_CFLAGS	+= -tm-
+endif
+
 # When using gcc the assembly is inlined in the C-file (see jslock.c)
 ifdef NS_USE_NATIVE
 ASFILES		= $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s))
@@ -143,8 +140,12 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -DEXPORT_JS_API
+
 INCLUDES	+= -I$(srcdir)
 
+GARBAGE		+= $(JSMATH_PRELINK) $(OBJDIR)/jscpucfg.o $(OBJDIR)/jsautocfg.h $(OBJDIR)/jsautocfg.tmp
+
 ifneq ($(findstring -L,$(NSPR_LIBS)),)
 NSPR_STATIC_PATH	= $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
 else
@@ -157,7 +158,6 @@ else
 LDFLAGS		= $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS)) -lm
 endif
 
-
 ifdef JS_SAFE_ARENA
 DEFINES		+= -DJS_USE_SAFE_ARENA
 endif
diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index d9e5d0d6090..191649d821d 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/Makefile.in
@@ -30,10 +30,10 @@ CPPSRCS		= xpcshell.cpp
 LIBS		= \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lmozreg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in
index 6bdc7b9f99c..21327fe2001 100644
--- a/mozilla/js/src/xpconnect/src/Makefile.in
+++ b/mozilla/js/src/xpconnect/src/Makefile.in
@@ -119,7 +119,7 @@ include $(topsrcdir)/config/rules.mk
 # this is automatically discovered under BeOS
 ifneq ($(OS_ARCH),BeOS)
 LIBS		+= \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lmozreg \
 		$(NSPR_LIBS) \
diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in
index 26b8d718161..1d380a83866 100644
--- a/mozilla/js/src/xpconnect/tests/Makefile.in
+++ b/mozilla/js/src/xpconnect/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,37 @@
 # 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@
 
-DIRS	= components
-
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = TestXPC
-
+MODULE		= TestXPC
 SIMPLE_PROGRAMS = TestXPC
 
-CPPSRCS = \
-	TestXPC.cpp \
-	$(NULL)
+DIRS		= components
 
-include $(topsrcdir)/config/config.mk
+CPPSRCS		= TestXPC.cpp
 
-DEFINES	+= -DJS_THREADSAFE
+LIBS		= \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lmozjs \
+		-lxpcom \
+		-lmozutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
-LIBS		= 		\
-	-L$(DIST)/bin \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lxpcom       \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NSPR_LIBS) 	\
-	$(NULL)
-
-
-# PROGS = $(OBJDIR)/TestXPC
-
-TEST_FILES = $(srcdir)/testxpc.js $(srcdir)/xpctest_echo.js
-
-# TARGETS= $(PROGS)
+TEST_FILES	= $(srcdir)/testxpc.js $(srcdir)/xpctest_echo.js
 
 include $(topsrcdir)/config/rules.mk
 
-# INCLUDES	+= -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xpconnect \
-#                -I$(PUBLIC)/raptor
-
-#$(PROGS): $(OBJS)
-#	@$(MAKE_OBJDIR)
-#	$(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
+DEFINES		+= -DJS_THREADSAFE
 
 export::
 	$(INSTALL) $(TEST_FILES) $(DIST)/bin
 
-# 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/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index ec98b2bde7d..1f73bfc112d 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -49,10 +49,10 @@ LIBS		+= \
 		-lsecfree \
 		-lraptorgfx \
 		-limg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(PNG_LIBS) \
 		$(JPEG_LIBS) \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		$(TIMER_LIBS) \
 		-lxpcom \
 		-lmozreg \
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 59539a985cc..f03562d2868 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/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,75 +13,69 @@
 # 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
 
-CPPSRCS = \
-	TestCSSParser.cpp	\
-	TestCSSPropertyLookup.cpp	\
-	TestCSSScanner.cpp	\
-	$(NULL)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-LOCAL_INCLUDES = -I$(srcdir)/../style/src
+CPPSRCS		= \
+		TestCSSParser.cpp \
+		TestCSSPropertyLookup.cpp \
+		TestCSSScanner.cpp \
+		$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
-SIMPLE_PROGRAMS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 
 ifndef NECKO
-NET_LIBS = 		\
-	-lpwcac \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lremoturl \
-	-lnetcnvts \
-	-labouturl \
-	-lhttpurl \
-	-lmimetype \
-	-lnetcache \
-	-lnetlib 	\
-	-lnetwork 	\
-	-lsockstuburl \
-	$(NULL)
+NET_LIBS	= \
+		-lpwcac \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lremoturl \
+		-lnetcnvts \
+		-labouturl \
+		-lhttpurl \
+		-lmimetype \
+		-lnetcache \
+		-lnetlib \
+		-lnetwork \
+		-lsockstuburl \
+		$(NULL)
 else
-NET_LIBS = 		\
-	-lneckoutil_s \
-	$(NULL)
+NET_LIBS	= -lneckoutil_s
 endif
 
-LIBS = \
-	-limg \
-	$(PNG_LIBS) \
-	$(JPEG_LIBS) \
-	-l$(MOZ_LIB_UTIL_PREFIX)util \
-	-lpref \
-	-lsecfree \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-ljsdom \
-	-lcaps \
-	-lraptorgfx 	\
-	-lxpcom \
-	-lxp \
-	-lraptorhtmlpars \
-	$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
-	-lexpat \
-	-lxmltok \
-	-ljsurl \
-	$(TIMER_LIBS) \
-	$(TK_LIBS) \
-	$(NET_LIBS) \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
+LIBS		= \
+		-limg \
+		$(PNG_LIBS) \
+		$(JPEG_LIBS) \
+		-lmozutil \
+		-lpref \
+		-lsecfree \
+		-lmozjs \
+		-ljsdom \
+		-lcaps \
+		-lraptorgfx \
+		-lxpcom \
+		-lxp \
+		-lraptorhtmlpars \
+		$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
+		-lexpat \
+		-lxmltok \
+		-ljsurl \
+		$(TIMER_LIBS) \
+		$(TK_LIBS) \
+		$(NET_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-test:
-	@echo srcdir = $(srcdir)
diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in
index f5cae1ab4b2..e31c856b2a3 100644
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@@ -33,10 +33,10 @@ BASE_LIBS	= \
 		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NULL)
 
 GECKO_LIBS	= \
@@ -62,7 +62,7 @@ NETLIB_LIBS	= \
 		-lnetwork \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 
diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
index a9f42c01c7d..75b16de301a 100644
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@@ -29,10 +29,10 @@ BASE_LIBS	= \
 		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NULL)
 
 GECKO_LIBS	= \
@@ -64,7 +64,7 @@ NETLIB_LIBS	= \
 		-lnetwork \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 
diff --git a/mozilla/modules/libutil/src/Makefile.in b/mozilla/modules/libutil/src/Makefile.in
index 0795783e5a7..e5a7819e052 100644
--- a/mozilla/modules/libutil/src/Makefile.in
+++ b/mozilla/modules/libutil/src/Makefile.in
@@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= util
-LIBRARY_NAME	= $(MOZ_LIB_UTIL_PREFIX)util
+LIBRARY_NAME	= mozutil
 
 INHIBIT_STRIP_NOT_EXPORTED = 1
 
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index 1d8e2660b1d..72e41ee937e 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -38,15 +38,15 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
 LIBS		= \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-lxpcom \
 		-lneckoutil_s \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/network/cache/nu/tests/fftest/Makefile.in b/mozilla/network/cache/nu/tests/fftest/Makefile.in
index fa4881f016c..a5d914c0075 100644
--- a/mozilla/network/cache/nu/tests/fftest/Makefile.in
+++ b/mozilla/network/cache/nu/tests/fftest/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,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM		= FlatFile
+
 CPPSRCS		= FlatFileTest.cpp
 
 REQUIRES	= cache
@@ -29,31 +31,30 @@ REQUIRES	= cache
 LOCAL_INCLUDES	+= -I../../include
 
 LIBS		= \
-	-lcache \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm \
-	-lnetlib \
-	-lnetcache \
-	-lmimetype \
-	-lremoturl \
-	-lsockstuburl \
-	-lhttpurl \
-	-lfileurl \
-	-lftpurl \
-	-lgophurl \
-	-lpwcac \
-	-labouturl \
-	-lnetwork \
-	-lnetcnvts \
-	$(TK_LIBS) \
-	-lpref \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lsecfree \
-	-lxpcom \
-	-lxp \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-PROGRAM		= FlatFile
+		-lcache \
+		-lmozdbm \
+		-lnetlib \
+		-lnetcache \
+		-lmimetype \
+		-lremoturl \
+		-lsockstuburl \
+		-lhttpurl \
+		-lfileurl \
+		-lftpurl \
+		-lgophurl \
+		-lpwcac \
+		-labouturl \
+		-lnetwork \
+		-lnetcnvts \
+		$(TK_LIBS) \
+		-lpref \
+		-lmozjs \
+		-lsecfree \
+		-lxpcom \
+		-lxp \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/network/module/tests/Makefile.in b/mozilla/network/module/tests/Makefile.in
index 61c96892537..c1125320fa9 100644
--- a/mozilla/network/module/tests/Makefile.in
+++ b/mozilla/network/module/tests/Makefile.in
@@ -45,9 +45,9 @@ LIBS		= \
 		-lnetcache \
 		-lpref \
 		-lsecfree \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-limg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-lxp \
 		-lxpcom \
 		$(TIMER_LIBS) \
diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in
index 39cb88cfab7..975f6faa632 100644
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@@ -53,7 +53,7 @@ LIBS		= \
 		-lnetcache \
 		-lhttpurl \
 		-lpwcac \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-limg \
 		-lmozutil \
 		-lxpcom \
diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in
index 9cf4017055c..89f5e25e700 100644
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/Makefile.in
@@ -29,10 +29,10 @@ BASE_LIBS	= \
 		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NULL)
 
 ifndef NECKO
@@ -51,7 +51,7 @@ NETLIB_LIBS	= \
 		-lnetwork \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 else
@@ -59,7 +59,7 @@ NETLIB_LIBS	= \
 		-lneckoutil_s \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		$(NULL)
 endif
 
diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in
index 41ab7045f3c..d105718d27c 100644
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/Makefile.in
@@ -29,10 +29,10 @@ BASE_LIBS	= \
 		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxpcom \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NULL)
 
 ifndef NECKO
@@ -51,7 +51,7 @@ NETLIB_LIBS	= \
 		-lnetwork \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 else
@@ -59,7 +59,7 @@ NETLIB_LIBS	= \
 		-lneckoutil_s \
 		-lxp \
 		-ljsurl \
-		-l$(MOZ_LIB_DBM_PREFIX)dbm \
+		-lmozdbm \
 		$(NULL)
 endif
 
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in
index 8395e9c0c53..f97a974c99f 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.in
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.in
@@ -91,36 +91,31 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include
 NULL = 
 NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread
 
-MOZ_LIB_JS_PREFIX = moz
-MOZ_LIB_UTIL_PREFIX = moz
-
 ZLIB_LIBS = -lz
 
-BASE_LIBS =          -lpref               $(ZLIB_LIBS)         -lmozreg                -l$(MOZ_LIB_JS_PREFIX)js             		-ltimer_s         -lxpcom              -lsecfree            -l$(MOZ_LIB_UTIL_PREFIX)util            $(NULL)
+BASE_LIBS = -lpref $(ZLIB_LIBS) -lmozreg -lmozjs -ltimer_s -lxpcom -lsecfree -lmozutil
 
 
 MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidget_gtk
 
-GECKO_LIBS =          -lraptorwebwidget     		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) 		-lraptorgfx 	        -lraptorhtmlpars              -lexpat         -lxmltok         -ljsdom                       $(NULL)
+GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx -lraptorhtmlpars -lexpat -lxmltok -ljsdom
 
 
 JPEG_LIBS = -ljpeg
 PNG_LIBS = -lpng
 
-IMGLIB_LIBS =          -limg                $(JPEG_LIBS)         $(PNG_LIBS)          $(NULL)
+IMGLIB_LIBS = -limg $(JPEG_LIBS) $(PNG_LIBS)
 
-MOZ_LIB_DBM_PREFIX = moz
-
-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 -lmozdbm -lpwcac
 
 
 JSJ_LIB = 
 TK_LIBS = 
 
-ALL_MOZ_LIBS =          $(GECKO_LIBS)          $(NETLIB_LIBS)         $(IMGLIB_LIBS)         $(BASE_LIBS)           $(JSJ_LIB)             $(NSPR_LIBS)           $(TK_LIBS)             $(NULL)
+ALL_MOZ_LIBS = $(GECKO_LIBS) $(NETLIB_LIBS) $(IMGLIB_LIBS) $(BASE_LIBS) $(JSJ_LIB) $(NSPR_LIBS) $(TK_LIBS)
 
 
-MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib          $(ALL_MOZ_LIBS)
+MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib $(ALL_MOZ_LIBS)
 
 
 INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index a5fa22910b7..a8c9b05e4ed 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -92,10 +92,10 @@ BASE_LIBS		= \
 			-lpref \
 			$(ZLIB_LIBS) \
 			-lmozreg \
-			-l$(MOZ_LIB_JS_PREFIX)js \
+			-lmozjs \
 			-lxpcom \
 			-lsecfree \
-			-l$(MOZ_LIB_UTIL_PREFIX)util \
+			-lmozutil \
 			$(NULL)
 
 GECKO_LIBS		= \
@@ -131,7 +131,7 @@ NETLIB_LIBS		= \
 			-lnetwork \
 			-lxp \
 			-ljsurl \
-			-l$(MOZ_LIB_DBM_PREFIX)dbm \
+			-lmozdbm \
 			-lpwcac \
 			$(NULL)
 else
@@ -139,7 +139,7 @@ NETLIB_LIBS		= \
 			-lneckoutil_s \
 			-lxp \
 			-ljsurl \
-			-l$(MOZ_LIB_DBM_PREFIX)dbm \
+			-lmozdbm \
 			$(NULL)
 endif
 
diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index fdc62a99d8f..e8879d5b723 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -54,13 +54,13 @@ endif
 LIBS		= \
 		-lpref \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-limg \
 		$(PNG_LIBS) \
 		$(JPEG_LIBS) \
 		-lxpcom \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 		-lraptorgfx \
 		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in
index b65f9f0faff..9e167bee413 100644
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@@ -54,13 +54,13 @@ endif
 LIBS		= \
 		-lpref \
 		-lsecfree \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-limg \
 		$(PNG_LIBS) \
 		$(JPEG_LIBS) \
 		-lxpcom \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
 		-lraptorgfx \
 		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in
index a5466c3a6fe..b56034e1fae 100644
--- a/mozilla/xpcom/proxy/tests/Makefile.in
+++ b/mozilla/xpcom/proxy/tests/Makefile.in
@@ -35,8 +35,9 @@ endif
 
 LIBS		= \
 		-L$(DIST)/bin \
+		-L$(DIST)/lib \
 		-lxpcom \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
index 9ee4f28191d..9472cb69992 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
@@ -27,19 +27,18 @@ SIMPLE_PROGRAMS	= TestXPTCInvoke
 
 CPPSRCS		= TestXPTCInvoke.cpp
 
-include $(topsrcdir)/config/config.mk
-
-CFLAGS		+= -DJS_THREADSAFE
-
 LIBS		= \
 		-L$(DIST)/bin \
+		-L$(DIST)/lib \
 		-lxpcom \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CFLAGS		+= -DJS_THREADSAFE
+
 # For _write().
 ifeq ($(OS_ARCH),BSD_OS)
 OS_LIBS		+= -lgcc
diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index eecbd457554..e6526d98010 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -86,11 +86,11 @@ endif
 
 LIBS		+= \
 		-limg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		$(NETLIB_LIBS) \
 		-lpref \
 		-lsecfree \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		-lxp \
 		-lxpcom \
 		$(TIMER_LIBS) \
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 0049a360b9b..c70b7ce249f 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -71,11 +71,11 @@ LIBS		+= \
 		-lcaps \
 		-ljsurl \
 		-lsecfree \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		$(JSJ_LIB) \
 		-lpref \
 		-limg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		-lmozutil \
 		-lxp \
 		-lxpcom \
 		$(ZLIB_LIBS) \
diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in
index 799aeeab3fb..c7e5123e602 100644
--- a/mozilla/xpfe/components/find/src/Makefile.in
+++ b/mozilla/xpfe/components/find/src/Makefile.in
@@ -33,8 +33,8 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozreg \
+		-lmozjs \
 		$(ZLIB_LIBS) \
-		-l$(MOZ_LIB_JS_PREFIX)js \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in
index 70d2a2e2089..8c7e936e9b2 100644
--- a/mozilla/xpfe/components/ucth/src/Makefile.in
+++ b/mozilla/xpfe/components/ucth/src/Makefile.in
@@ -33,9 +33,9 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozreg \
+		-lmozjs	\
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
-		-l$(MOZ_LIB_JS_PREFIX)js	\
 		$(NULL)
 
 ifndef NECKO
diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in
index 78ef861f6be..f9f6fc8ff0d 100644
--- a/mozilla/xpfe/components/xfer/src/Makefile.in
+++ b/mozilla/xpfe/components/xfer/src/Makefile.in
@@ -36,7 +36,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozreg \
-		-l$(MOZ_LIB_JS_PREFIX)js \
+		-lmozjs \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)