From 0a278b6afc2184987d966cc27252c1f0ff142736 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Wed, 26 Sep 2001 20:17:35 +0000 Subject: [PATCH] bug 101761 - clean up embed components so we can better understand REQUIRES r=cls git-svn-id: svn://10.0.0.236/trunk@103856 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/base/makefile.win | 3 +-- mozilla/embedding/base/nsEmbedAPI.cpp | 1 + mozilla/embedding/browser/webBrowser/makefile.win | 1 - mozilla/embedding/components/appstartup/src/makefile.win | 2 +- mozilla/embedding/components/find/src/makefile.win | 3 +-- mozilla/embedding/components/jsconsole/src/makefile.win | 4 ++-- mozilla/embedding/components/windowwatcher/src/makefile.win | 5 ++--- mozilla/embedding/tests/winEmbed/makefile.win | 2 +- mozilla/extensions/xmlextras/build/src/makefile.win | 2 +- mozilla/intl/chardet/src/makefile.win | 6 +----- mozilla/modules/libpref/src/makefile.win | 1 - mozilla/xpfe/bootstrap/makefile.win | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/mozilla/embedding/base/makefile.win b/mozilla/embedding/base/makefile.win index 8d19ef0d5e6..25406d58cea 100644 --- a/mozilla/embedding/base/makefile.win +++ b/mozilla/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 = \ diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index 0f7bdd45e7d..dda0ad0eeba 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/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; diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win index 1fb37bc6a21..d72cc2a2626 100644 --- a/mozilla/embedding/browser/webBrowser/makefile.win +++ b/mozilla/embedding/browser/webBrowser/makefile.win @@ -39,7 +39,6 @@ REQUIRES = xpcom \ wallet \ appcomps \ gfx \ - raptor \ content \ history \ $(NULL) diff --git a/mozilla/embedding/components/appstartup/src/makefile.win b/mozilla/embedding/components/appstartup/src/makefile.win index f277958f911..f0e9afc3599 100644 --- a/mozilla/embedding/components/appstartup/src/makefile.win +++ b/mozilla/embedding/components/appstartup/src/makefile.win @@ -20,7 +20,7 @@ DEPTH=..\..\..\.. -MODULE=embedcomponents +MODULE=appstartup REQUIRES = xpcom \ string \ $(NULL) diff --git a/mozilla/embedding/components/find/src/makefile.win b/mozilla/embedding/components/find/src/makefile.win index 482d0d5d84b..61a75b15229 100644 --- a/mozilla/embedding/components/find/src/makefile.win +++ b/mozilla/embedding/components/find/src/makefile.win @@ -20,10 +20,9 @@ DEPTH=..\..\..\.. -MODULE=embedcomponents +MODULE=find REQUIRES = string \ xpcom \ - find \ txtsvc \ dom \ docshell \ diff --git a/mozilla/embedding/components/jsconsole/src/makefile.win b/mozilla/embedding/components/jsconsole/src/makefile.win index 958ff9c5c66..5936d1dd546 100644 --- a/mozilla/embedding/components/jsconsole/src/makefile.win +++ b/mozilla/embedding/components/jsconsole/src/makefile.win @@ -20,8 +20,8 @@ DEPTH=..\..\..\.. -MODULE=embedcomponents -REQUIRES = jsconsole \ +MODULE=jsconsole +REQUIRES = \ xpcom \ string \ dom \ diff --git a/mozilla/embedding/components/windowwatcher/src/makefile.win b/mozilla/embedding/components/windowwatcher/src/makefile.win index 6b53f8d2b28..7d8dfa2fa1c 100644 --- a/mozilla/embedding/components/windowwatcher/src/makefile.win +++ b/mozilla/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 diff --git a/mozilla/embedding/tests/winEmbed/makefile.win b/mozilla/embedding/tests/winEmbed/makefile.win index 1f424fd456c..45566b954a5 100644 --- a/mozilla/embedding/tests/winEmbed/makefile.win +++ b/mozilla/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 diff --git a/mozilla/extensions/xmlextras/build/src/makefile.win b/mozilla/extensions/xmlextras/build/src/makefile.win index 40b45ec7cfa..d9c93d8f4b2 100644 --- a/mozilla/extensions/xmlextras/build/src/makefile.win +++ b/mozilla/extensions/xmlextras/build/src/makefile.win @@ -28,7 +28,7 @@ REQUIRES = xpcom \ caps \ necko \ webBrowser_core \ - embedcomponents \ + appstartup \ content \ $(NULL) LIBRARY_NAME=xmlextras diff --git a/mozilla/intl/chardet/src/makefile.win b/mozilla/intl/chardet/src/makefile.win index 9970a915d53..e5bf3d53d18 100644 --- a/mozilla/intl/chardet/src/makefile.win +++ b/mozilla/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) diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index 9b64b1ce37e..710fc054332 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -48,7 +48,6 @@ REQUIRES = xpcom \ intl \ timer \ necko \ - embedcomponents \ profile \ $(NULL) diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win index 8e06fcab097..e1da595fdf0 100644 --- a/mozilla/xpfe/bootstrap/makefile.win +++ b/mozilla/xpfe/bootstrap/makefile.win @@ -39,7 +39,7 @@ REQUIRES = xpcom \ view \ windowwatcher \ embed_base \ - embedcomponents \ + appstartup \ mpfilelocprovider \ mozbrwsr \ appcomps \