General cleanup.

xpinstall/notifier/Makefile.in

@@ -22,13 +22,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = xpiflash
-LIBRARY_NAME = xpiflash
-IS_COMPONENT = 1
+MODULE		= xpiflash
+LIBRARY_NAME	= xpiflash
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-		nsXPIFlash.cpp \
-		$(NULL)
+CPPSRCS		= nsXPIFlash.cpp
 
 EXPORT_RESOURCE_NOTIFIER = \
 		$(srcdir)/SoftwareUpdates.rdf \
@@ -36,11 +34,10 @@ EXPORT_RESOURCE_NOTIFIER = \
 		$(srcdir)/notification.gif \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS =\
-		-L$(DIST)/lib \
-		-lmozreg_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lmozreg_s
 
 include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_NOTIFIER) $(DIST)/bin/res/xpinstall
+

xpinstall/src/Makefile.in

@@ -24,14 +24,15 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= nsxpi
 LIBRARY_NAME	= nsxpi
 IS_COMPONENT	= 1
+
 REQUIRES	= dom js netlib raptor xpcom
 
 # XXX shouldn't need to export this
@@ -64,12 +65,13 @@ CPPSRCS		= \
 
 LOCAL_INCLUDES	= -I$(srcdir)/../public
 
-EXTRA_DSO_LDOPTS =\
-			$(MOZ_NECKO_UTIL_LIBS) \
-			$(MOZ_REGISTRY_LIBS) \
-			-L$(DIST)/bin \
-			-ljsdom \
-			$(ZLIB_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_REGISTRY_LIBS) \
+		-L$(DIST)/bin \
+		-ljsdom \
+		$(ZLIB_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk