bug 101761 - clean up embed components so we can better understand REQUIRES r=cls

embedding/base/makefile.win

@@ -27,16 +27,15 @@ REQUIRES	= xpcom \
 		  view \
 		  dom \
 		  necko \
-		  rdf \
 		  appshell \
 		  uriloader \
 		  layout \
 		  editor \
 		  intl \
 		  chrome \
-		  embedcomponents \
 		  timer \
 		  gfx \
+		  appstartup \
 		  $(NULL)
 
 EXPORTS =                  \

embedding/base/nsEmbedAPI.cpp

@@ -31,6 +31,7 @@
 #include "nsIDirectoryService.h"
 
 #include "nsEmbedAPI.h"
+#include "nsLiteralString.h"
 
 static nsIServiceManager *sServiceManager = nsnull;
 static PRBool             sRegistryInitializedFlag = PR_FALSE;

embedding/browser/webBrowser/makefile.win

@@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  wallet \
 		  appcomps \
 		  gfx \
-		  raptor \
 		  content \
 		  history \
 		  $(NULL)

embedding/components/appstartup/src/makefile.win

@@ -20,7 +20,7 @@
 
 DEPTH=..\..\..\..
 
-MODULE=embedcomponents
+MODULE=appstartup
 REQUIRES	= xpcom \
 		  string \
 		  $(NULL)

embedding/components/find/src/makefile.win

@@ -20,10 +20,9 @@
 
 DEPTH=..\..\..\..
 
-MODULE=embedcomponents
+MODULE=find
 REQUIRES	= string \
 		  xpcom \
-		  find \
 		  txtsvc \
 		  dom \
 		  docshell \

embedding/components/jsconsole/src/makefile.win

@@ -20,8 +20,8 @@
 
 DEPTH=..\..\..\..
 
-MODULE=embedcomponents
-REQUIRES	= jsconsole \
+MODULE=jsconsole
+REQUIRES	= \
 		  xpcom \
 		  string \
 		  dom \

embedding/components/windowwatcher/src/makefile.win

@@ -20,23 +20,22 @@
 
 DEPTH=..\..\..\..
 
-MODULE=embedcomponents
+MODULE=windowwatcher
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  windowwatcher \
 		  widget \
 		  js \
 		  xpconnect \
 		  caps \
 		  layout \
+		  content \
 		  necko \
 		  docshell \
 		  webBrowser_core \
 		  embed_base \
 		  wallet \
 		  intl \
-		  content \
 		  $(NULL)
 
 LIBRARY_NAME=windowwatcher_s

embedding/tests/winEmbed/makefile.win

@@ -29,7 +29,6 @@ REQUIRES	= xpcom \
 		  embed_base \
 		  webBrowser_core \
 		  webshell \
-		  embedding \
 		  windowwatcher \
 		  profile \
 		  necko \
@@ -41,6 +40,7 @@ REQUIRES	= xpcom \
 		  uriloader \
 		  shistory \
 		  $(NULL)
+
 PROGRAM         = .\$(OBJDIR)\$(MODULE).exe
 RESFILE         = $(MODULE).res
 

extensions/xmlextras/build/src/makefile.win

@@ -28,7 +28,7 @@ REQUIRES	= xpcom \
 		  caps \
 		  necko \
 		  webBrowser_core \
-		  embedcomponents \
+		  appstartup \
 		  content \
 		  $(NULL)
 LIBRARY_NAME=xmlextras

intl/chardet/src/makefile.win

@@ -73,14 +73,10 @@ REQUIRES	= xpcom \
 		  necko \
 		  widget \
 		  layout \
-		  embedcomponents \
-		  raptor \
 		  content \
+		  appstartup \
 		  $(NULL)
 
-INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\chardet -I$(PUBLIC)\raptor \
-     -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\webshell
-
 LLIBS= \
 	$(DIST)\lib\xpcom.lib	\
 	$(LIBNSPR)	

modules/libpref/src/makefile.win

@@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  timer \
 		  necko \
-		  embedcomponents \
 		  profile \
 		  $(NULL)
 

xpfe/bootstrap/makefile.win

@@ -39,7 +39,7 @@ REQUIRES	= xpcom \
 		  view \
 		  windowwatcher \
 		  embed_base \
-		  embedcomponents \
+		  appstartup \
 		  mpfilelocprovider \
 		  mozbrwsr \
 		  appcomps \