diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in
index 577597d34feb..422e780a38a7 100644
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/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,44 @@
 # 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 = cookie
-
-IS_COMPONENT = 1
-
-CPPSRCS =				\
-	nsCookieService.cpp			\
-	nsCookie.cpp			\
-	nsCookieHTTPNotify.cpp			\
-    $(NULL)
-
-EXPORTS = \
-	nsICookieService.h \
-	nsCookieHTTPNotify.h \
-	nsCookie.h \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+MODULE		= cookie
+LIBRARY_NAME	= cookie
+IS_COMPONENT	= 1
 
 ifdef ENABLE_TESTS
-DIRS            = tests
+DIRS		= tests
 endif
 
-MODULE = cookie
+REQUIRES	= js netlib xpcom xppref32 nspr
 
-REQUIRES = js netlib xpcom xppref32 nspr
+CPPSRCS		= \
+		nsCookieService.cpp \
+		nsCookie.cpp \
+		nsCookieHTTPNotify.cpp \
+		$(NULL)
 
-include $(topsrcdir)/config/config.mk
+EXPORTS		= \
+		nsICookieService.h \
+		nsCookieHTTPNotify.h \
+		nsCookie.h \
+		$(NULL)
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC=$(DEPTH)/netwerk/dist/include
-endif
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/bin \
-				$(NSPR_LIBS)	\
-				-lxpcom	\
-				-lsecfree \
-				$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		$(NSPR_LIBS) \
+		-lxpcom \
+		-lsecfree \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/irc/Makefile.in b/extensions/irc/Makefile.in
index 9e6018b384a5..9a377f61a61c 100644
--- a/extensions/irc/Makefile.in
+++ b/extensions/irc/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Mozilla Public License
 # Version 1.1 (the "License"); you may not use this file except in
 # compliance with the License. You may obtain a copy of the License at
@@ -16,42 +16,40 @@
 # Inc. Portions created by New Dimensions Consulting, Inc. Copyright (C) 1999
 # New Dimenstions Consulting, Inc. All Rights Reserved.
 #
-#
 # Contributor(s):
 #  Robert Ginda, rginda@ndcico.com, original author
+#
 
 DEPTH		= ../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
-
-MODULE = irc
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-	libbs \
-	$(NULL)
+MODULE		= irc
 
-JSLIBFILES = \
-	$(srcdir)/js/lib/utils.js \
-	$(srcdir)/js/lib/events.js \
-	$(srcdir)/js/lib/connection-xpcom.js \
-	$(srcdir)/js/lib/irc.js \
-	$(NULL)
+DIRS		= libbs
 
-XULLIBFILES = \
-	$(srcdir)/xul/lib/EntryHistory.js \
-	$(NULL)
+JSLIBFILES	= \
+		$(srcdir)/js/lib/utils.js \
+		$(srcdir)/js/lib/events.js \
+		$(srcdir)/js/lib/connection-xpcom.js \
+		$(srcdir)/js/lib/irc.js \
+		$(NULL)
 
-TESTFILES = \
-	$(srcdir)/xul/tests/test2.html \
-	$(srcdir)/xul/tests/test2.css \
-	$(srcdir)/xul/tests/test2-static.js \
-	$(srcdir)/xul/tests/test2-handlers.js \
-	$(srcdir)/xul/tests/csteel1.jpg \
-	$(srcdir)/xul/tests/csteel2.jpg \
-	$(NULL)
+XULLIBFILES	= \
+		$(srcdir)/xul/lib/EntryHistory.js \
+		$(NULL)
+
+TESTFILES	= \
+		$(srcdir)/xul/tests/test2.html \
+		$(srcdir)/xul/tests/test2.css \
+		$(srcdir)/xul/tests/test2-static.js \
+		$(srcdir)/xul/tests/test2-handlers.js \
+		$(srcdir)/xul/tests/csteel1.jpg \
+		$(srcdir)/xul/tests/csteel2.jpg \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/extensions/irc/libbs/Makefile.in b/extensions/irc/libbs/Makefile.in
index c49251dde94a..99474434810f 100644
--- a/extensions/irc/libbs/Makefile.in
+++ b/extensions/irc/libbs/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Mozilla Public License
 # Version 1.1 (the "License"); you may not use this file except in
 # compliance with the License. You may obtain a copy of the License at
@@ -15,39 +15,38 @@
 # Inc. Portions created by New Dimensions Consulting, Inc. Copyright (C) 1999
 # New Dimenstions Consulting, Inc. All Rights Reserved.
 #
-#
 # Contributor(s):
 #  Robert Ginda, rginda@ndcico.com, original author
+#
 
 DEPTH		= ../../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS = \
-	bsutil.c \
-	bserror.c \
-	bsevent.c \
-	bsqueue.c \
-	bsnetwork.c \
-	bsserver.c \
-	bsconnection.c \
-	$(NULL)
+MODULE		= bs
+LIBRARY_NAME	= bs
+IS_COMPONENT	= 1
 
-XPIDLSRCS = \
-	bsIConnection.idl \
-	$(NULL)
+REQUIRES	= bs xpcom
 
-CPPSRCS = \
-	bsXPCConnection.cpp \
-	bsXPCConnectionFactory.cpp \
-	$(NULL)
+CSRCS		= \
+		bsutil.c \
+		bserror.c \
+		bsevent.c \
+		bsqueue.c \
+		bsnetwork.c \
+		bsserver.c \
+		bsconnection.c \
+		$(NULL)
 
-REQUIRES = bs xpcom
-MODULE = bs
-LIBRARY_NAME = bs
-IS_COMPONENT = 1
+CPPSRCS		= \
+		bsXPCConnection.cpp \
+		bsXPCConnectionFactory.cpp \
+		$(NULL)
+
+XPIDLSRCS	= bsIConnection.idl
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/pics/src/Makefile.in b/extensions/pics/src/Makefile.in
index f1754f530d91..32f6cc485fca 100644
--- a/extensions/pics/src/Makefile.in
+++ b/extensions/pics/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,45 +13,33 @@
 # 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		= pics
+LIBRARY_NAME	= pics
 
-LIBRARY_NAME = pics
+REQUIRES	= js netlib xpcom xppref32 nspr
 
-CSRCS =				\
-    cslabel.c	\
-	csparse.c	\
-	htchunk.c	\
-	htlist.c	\
-	htstring.c	\
-	lablpars.c	\
-	$(NULL)
+CSRCS		= \
+		cslabel.c \
+		csparse.c \
+		htchunk.c \
+		htlist.c \
+		htstring.c \
+		lablpars.c \
+		$(NULL)
 
-CPPSRCS =				\
-	nsPICS.cpp			\
-    $(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = pics
-
-REQUIRES = js netlib xpcom xppref32 nspr
-
-MKSHLIB :=
+CPPSRCS		= nsPICS.cpp
 
 # we don't want the shared lib
-NO_SHARED_LIB=1
-
-include $(topsrcdir)/config/config.mk
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/pics/tests/Makefile.in b/extensions/pics/tests/Makefile.in
index 4dbc60bd14a6..29017e9394a7 100644
--- a/extensions/pics/tests/Makefile.in
+++ b/extensions/pics/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,27 +22,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= TestPICS.cpp
+PROGRAM		= TestPICS
 
-LOCAL_INCLUDES  =
+CPPSRCS		= TestPICS.cpp
 
 REQUIRES	= js pics pref xpcom include
 
 LIBS		= \
-	-lxpcom \
-	-lpics \
-	$(NSPR_LIBS) \
-	$(NULL)
+		-lxpcom \
+		-lpics \
+		$(NSPR_LIBS) \
+		$(NULL)
 
-PROGRAM		= TestPICS
-
-include $(topsrcdir)/config/config.mk
+EXPORT_SAMPLES	= samples/picstest1.html
 
 include $(topsrcdir)/config/rules.mk
 
-EXPORT_SAMPLES = 		\
-        samples/picstest1.html	\
-        $(NULL)
-
 install::
 	$(INSTALL) $(EXPORT_SAMPLES) $(DIST)/bin/res/samples
diff --git a/extensions/wallet/Makefile.in b/extensions/wallet/Makefile.in
index 99f9439012f3..2aee20182734 100644
--- a/extensions/wallet/Makefile.in
+++ b/extensions/wallet/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,16 +13,15 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-
-DIRS=public src editor signonviewer cookieviewer walletpreview build
-#DIRS=public src
-
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
+
+DIRS		= public src editor signonviewer cookieviewer walletpreview build
+
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/wallet/cookieviewer/Makefile.in b/extensions/wallet/cookieviewer/Makefile.in
index 7e96135f6d80..b3d320376549 100644
--- a/extensions/wallet/cookieviewer/Makefile.in
+++ b/extensions/wallet/cookieviewer/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,29 +22,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = walletviewers
-LIBRARY_NAME = cookieviewer_s
-XPIDL_MODULE = cookieviewer
+MODULE		= walletviewers
+LIBRARY_NAME	= cookieviewer_s
+XPIDL_MODULE	= cookieviewer
 
-XPIDLSRCS = \
-	nsICookieViewer.idl		\
-	$(NULL)
+REQUIRES	= walleteditor raptor xpcom
 
-CPPSRCS = \
-	nsCookieViewer.cpp		\
-	$(NULL)
+CPPSRCS		= nsCookieViewer.cpp
 
-REQUIRES = walleteditor raptor xpcom
-
-include $(topsrcdir)/config/config.mk
-
-MKSHLIB :=
+XPIDLSRCS	= nsICookieViewer.idl
 
 # we don't want the shared lib, but we want to force the creation of a static lib
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 
 install:: $(TARGETS)
-	$(INSTALL) $(srcdir)/CookieViewer.xul $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/CookieViewer.js $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/res/samples
diff --git a/extensions/wallet/editor/Makefile.in b/extensions/wallet/editor/Makefile.in
index 5c47b36c6082..b391843eb7c7 100644
--- a/extensions/wallet/editor/Makefile.in
+++ b/extensions/wallet/editor/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,30 +22,22 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = walletviewers
-LIBRARY_NAME = walleteditor_s
-XPIDL_MODULE=walleteditor
+MODULE		= walletviewers
+LIBRARY_NAME	= walleteditor_s
+XPIDL_MODULE	= walleteditor
 
-XPIDLSRCS = \
-	nsIWalletEditor.idl		\
-	$(NULL)
+REQUIRES	= walleteditor raptor xpcom
 
-CPPSRCS = \
-	nsWalletEditor.cpp		\
-	$(NULL)
+CPPSRCS		= nsWalletEditor.cpp
 
-REQUIRES = walleteditor raptor xpcom
-
-include $(topsrcdir)/config/config.mk
-
-MKSHLIB :=
+XPIDLSRCS	= nsIWalletEditor.idl
 
 # we don't want the shared lib, but we want to force the creation of a static lib
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 
 install:: $(TARGETS)
-	$(INSTALL) $(srcdir)/WalletEditor.xul $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/WalletEditor.js $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/WalletEditor.xul $(srcdir)/WalletEditor.js $(DIST)/bin/res/samples
 
diff --git a/extensions/wallet/public/Makefile.in b/extensions/wallet/public/Makefile.in
index dddaafe45e4c..dcb1e31cee25 100644
--- a/extensions/wallet/public/Makefile.in
+++ b/extensions/wallet/public/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,19 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-EXPORTS =			\
-	nsIWalletService.h	\
-	$(NULL)			
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = wallet
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+MODULE		= wallet
+
+EXPORTS		= nsIWalletService.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/wallet/signonviewer/Makefile.in b/extensions/wallet/signonviewer/Makefile.in
index 70fc0d8b559b..f4b4d6b3e0ee 100644
--- a/extensions/wallet/signonviewer/Makefile.in
+++ b/extensions/wallet/signonviewer/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,29 +22,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = walletviewers
-LIBRARY_NAME = signonviewer_s
-XPIDL_MODULE = signonviewer
+MODULE		= walletviewers
+LIBRARY_NAME	= signonviewer_s
+XPIDL_MODULE	= signonviewer
 
-XPIDLSRCS = \
-	nsISignonViewer.idl		\
-	$(NULL)
+REQUIRES	= walleteditor raptor xpcom
 
-CPPSRCS = \
-	nsSignonViewer.cpp		\
-	$(NULL)
+CPPSRCS		= nsSignonViewer.cpp
 
-REQUIRES = walleteditor raptor xpcom
-
-include $(topsrcdir)/config/config.mk
-
-MKSHLIB :=
+XPIDLSRCS	= nsISignonViewer.idl
 
 # we don't want the shared lib, but we want to force the creation of a static lib
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 
 install:: $(TARGETS)
-	$(INSTALL) $(srcdir)/SignonViewer.xul $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/SignonViewer.js $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/SignonViewer.xul $(srcdir)/SignonViewer.js $(DIST)/bin/res/samples
diff --git a/extensions/wallet/src/Makefile.in b/extensions/wallet/src/Makefile.in
index 21947bbd4aad..ea40e2aff4b5 100644
--- a/extensions/wallet/src/Makefile.in
+++ b/extensions/wallet/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,41 +13,42 @@
 # 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
-include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME=wallet
-IS_COMPONENT=1
+MODULE		= wallet
+LIBRARY_NAME	= wallet
+IS_COMPONENT	= 1
 
-CPPSRCS =				\
-	nsWalletFactory.cpp		\
-	nsWalletService.cpp		\
-	wallet.cpp			\
-	singsign.cpp			\
-	$(NULL)
+REQUIRES	= wallet
 
-MODULE=wallet
-REQUIRES=wallet
+CPPSRCS		= \
+		nsWalletFactory.cpp \
+		nsWalletService.cpp \
+		wallet.cpp \
+		singsign.cpp \
+		$(NULL)
 
-EXPORTS= $(NULL)
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+RES_FILES	= \
+		$(srcdir)/FieldSchema.tbl \
+		$(srcdir)/URLFieldSchema.tbl \
+		$(srcdir)/SchemaConcat.tbl \
+		$(srcdir)/cookie.properties \
+		$(srcdir)/wallet.properties \
+		$(NULL)
 
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/bin \
-				-lsecfree \
-				$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-lsecfree \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(srcdir)/FieldSchema.tbl $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/URLFieldSchema.tbl $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/SchemaConcat.tbl $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/cookie.properties $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/wallet.properties $(DIST)/bin/res
+	$(INSTALL) $(RES_FILES) $(DIST)/bin/res
diff --git a/extensions/wallet/walletpreview/Makefile.in b/extensions/wallet/walletpreview/Makefile.in
index 6525a1a3e257..831b126e1345 100644
--- a/extensions/wallet/walletpreview/Makefile.in
+++ b/extensions/wallet/walletpreview/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,29 +22,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = walletviewers
-LIBRARY_NAME = walletpreview_s
-XPIDL_MODULE = walletpreview
+MODULE		= walletviewers
+LIBRARY_NAME	= walletpreview_s
+XPIDL_MODULE	= walletpreview
 
-XPIDLSRCS = \
-	nsIWalletPreview.idl		\
-	$(NULL)
+REQUIRES	= walleteditor raptor xpcom
 
-CPPSRCS = \
-	nsWalletPreview.cpp		\
-	$(NULL)
+CPPSRCS		= nsWalletPreview.cpp
 
-REQUIRES = walleteditor raptor xpcom
-
-include $(topsrcdir)/config/config.mk
-
-MKSHLIB :=
+XPIDLSRCS	= nsIWalletPreview.idl
 
 # we don't want the shared lib, but we want to force the creation of a static lib
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 
 install:: $(TARGETS)
-	$(INSTALL) $(srcdir)/WalletPreview.xul $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/WalletPreview.js $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/WalletPreview.xul $(srcdir)/WalletPreview.js $(DIST)/bin/res/samples