General cleanup.

extensions/cookie/Makefile.in

@@ -54,3 +54,4 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

extensions/cookie/tests/Makefile.in

@@ -27,9 +27,7 @@ CPPSRCS		= TestCookie.cpp
 
 REQUIRES	= js cookie pref xpcom include
 
-LIBS		= \
-		-lxpcom \
-		$(NSPR_LIBS) \
-		$(NULL)
+LIBS		= -lxpcom $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+

extensions/pics/Makefile.in

@@ -28,6 +28,5 @@ ifdef ENABLE_TESTS
 DIRS		+= tests
 endif
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+

extensions/pics/public/Makefile.in

@@ -32,6 +32,5 @@ EXPORTS	=                       \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+

extensions/pics/src/Makefile.in

@@ -43,3 +43,4 @@ override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+

extensions/pics/tests/Makefile.in

@@ -34,9 +34,8 @@ LIBS		= \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-EXPORT_SAMPLES	= samples/picstest1.html
-
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(EXPORT_SAMPLES) $(DIST)/bin/res/samples
+	$(INSTALL) samples/picstest1.html $(DIST)/bin/res/samples
+

extensions/wallet/Makefile.in

@@ -25,3 +25,4 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= public src editor signonviewer cookieviewer walletpreview build
 
 include $(topsrcdir)/config/rules.mk
+

extensions/wallet/build/Makefile.in

@@ -22,8 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= walletviewers
 MODULE		= walletviewers
+LIBRARY_NAME	= walletviewers
 IS_COMPONENT	= 1
 
 CPPSRCS		= nsWalletViewerFactory.cpp
@@ -38,7 +38,8 @@ SHARED_LIBRARY_LIBS = \
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL)
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

extensions/wallet/cookieviewer/Makefile.in

@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/CookieViewer.properties $(DIST)/bin/chrome/wallet/locale/en-US
+

extensions/wallet/public/Makefile.in

@@ -28,3 +28,4 @@ EXPORTS		= nsIWalletService.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+

extensions/wallet/signonviewer/Makefile.in

@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/SignonViewer.xul $(srcdir)/SignonViewer.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/SignonViewer.properties $(DIST)/bin/chrome/wallet/locale/en-US
+

extensions/wallet/src/Makefile.in

@@ -56,3 +56,4 @@ include $(topsrcdir)/config/rules.mk
 install::
 	$(INSTALL) $(RES_FILES) $(DIST)/bin/res
 	$(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/wallet/locale/en-US
+

extensions/wallet/walletpreview/Makefile.in

@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/WalletPreview.xul $(srcdir)/WalletPreview.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/WalletPreview.properties $(DIST)/bin/chrome/wallet/locale/en-US
+