One module per line for REQUIRES. r=/sr=alecf

gfx/src/makefile.win

@@ -24,7 +24,24 @@ DEPTH=..\..
 DIRS = windows
 
 MODULE=gfx
-REQUIRES	= xpcom string widget util dom locale view necko pref timer uriloader gfx2 imglib2 intl mimetype content layout
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  util \
+		  dom \
+		  locale \
+		  view \
+		  necko \
+		  pref \
+		  timer \
+		  uriloader \
+		  gfx2 \
+		  imglib2 \
+		  intl \
+		  mimetype \
+		  content \
+		  layout \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=gkgfx

gfx/src/windows/makefile.win

@@ -24,7 +24,16 @@ DEPTH=..\..\..
 MODULE=gfx
 LIBRARY_NAME=gkgfxwin
 MODULE_NAME=nsGfxModule
-REQUIRES=xpcom string widget intl view pref uconv locale necko
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  intl \
+		  view \
+		  pref \
+		  uconv \
+		  locale \
+		  necko \
+		  $(NULL)
 DEFINES=-DWIN32_LEAN_AND_MEAN -DSTRICT
 
 !if defined(NGLAYOUT_DDRAW)

gfx/tests/makefile.win

@@ -21,7 +21,10 @@
 
 DEPTH=..\..
 
-REQUIRES	= xpcom string gfx
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  $(NULL)
 MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestRect.exe
 PROG2 = .\$(OBJDIR)\TestColorNames.exe

widget/src/build/makefile.win

@@ -25,7 +25,15 @@ DEPTH=..\..\..
 MODULE         = widget
 LIBRARY_NAME   = gkwidget
 MODULE_NAME = nsWidgetModule
-REQUIRES = xpcom string widget necko uconv gfx dom timer
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  necko \
+		  uconv \
+		  gfx \
+		  dom \
+		  timer \
+		  $(NULL)
 RESFILE = widget.res
 
 CPPSRCS  = nsWinWidgetFactory.cpp

widget/src/support/makefile.win

@@ -34,7 +34,12 @@ EXPORTS = \
 	$(NULL)
 
 MODULE=widget 
-REQUIRES	= xpcom string widget layout gfx
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  layout \
+		  gfx \
+		  $(NULL)
 
 OBJS= \
 	.\$(OBJDIR)\nsWidgetSupport.obj  \

widget/src/windows/makefile.win

@@ -21,7 +21,21 @@
 
 DEPTH=..\..\..
 MODULE=widget 
-REQUIRES=xpcom string dom content accessibility layout gfx necko pref plugin timer uconv intl content_xul
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  content \
+		  accessibility \
+		  layout \
+		  gfx \
+		  necko \
+		  pref \
+		  plugin \
+		  timer \
+		  uconv \
+		  intl \
+		  content_xul \
+		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME = raptorwidget_s

widget/src/xpwidgets/makefile.win

@@ -20,7 +20,23 @@
 # Contributor(s): 
 
 DEPTH=..\..\..
-REQUIRES	= xpcom string layout content dom pref docshell view intl locale necko htmlparser webshell uconv unicharutil gfx
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  content \
+		  dom \
+		  pref \
+		  docshell \
+		  view \
+		  intl \
+		  locale \
+		  necko \
+		  htmlparser \
+		  webshell \
+		  uconv \
+		  unicharutil \
+		  gfx \
+		  $(NULL)
 
 LIBRARY_NAME = raptorbasewidget_s
 DEFINES =-D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT

widget/timer/src/windows/makefile.win

@@ -21,7 +21,10 @@
 
 DEPTH=..\..\..\..
 LIBRARY_NAME=timer_s
-REQUIRES=xpcom string widget
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  $(NULL)
 DEFINES=-DWIN32_LEAN_AND_MEAN -DSTRICT
 
 EXPORTS=nsTimerManager.h nsWindowsTimer.h nsIWindowsTimerMap.h