diff --git a/mozilla/accessible/src/makefile.win b/mozilla/accessible/src/makefile.win index 79cd22ff95a..ff691c081c8 100644 --- a/mozilla/accessible/src/makefile.win +++ b/mozilla/accessible/src/makefile.win @@ -36,7 +36,6 @@ REQUIRES = xpcom \ webshell \ necko \ htmlparser \ - xuldoc \ imglib2 \ gfx \ gfx2 \ diff --git a/mozilla/content/base/src/makefile.win b/mozilla/content/base/src/makefile.win index 1d8f3d80725..e14e9578b1a 100644 --- a/mozilla/content/base/src/makefile.win +++ b/mozilla/content/base/src/makefile.win @@ -85,7 +85,6 @@ REQUIRES = xpcom \ xpconnect \ util \ unicharutil \ - layout_xsl \ layout \ gfx \ layout_xul \ diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win index 7bbfce9d725..4faf55f936e 100644 --- a/mozilla/content/html/content/src/makefile.win +++ b/mozilla/content/html/content/src/makefile.win @@ -29,7 +29,6 @@ REQUIRES = xpcom \ dom \ js \ locale \ - unicharutil \ webshell \ htmlparser \ necko \ diff --git a/mozilla/content/html/document/src/makefile.win b/mozilla/content/html/document/src/makefile.win index 618b23a849a..f7d1c077a7f 100644 --- a/mozilla/content/html/document/src/makefile.win +++ b/mozilla/content/html/document/src/makefile.win @@ -45,7 +45,6 @@ REQUIRES = xpcom \ rdf \ chardet \ nkcache \ - appcomps \ lwbrk \ gfx2 \ imglib2 \ diff --git a/mozilla/content/html/style/src/makefile.win b/mozilla/content/html/style/src/makefile.win index 8431dda1e1b..2b205e6ccde 100644 --- a/mozilla/content/html/style/src/makefile.win +++ b/mozilla/content/html/style/src/makefile.win @@ -33,11 +33,9 @@ REQUIRES = xpcom \ necko \ webshell \ htmlparser \ - docshell \ uconv \ unicharutil \ xpconnect \ - pref \ layout \ gfx \ content_xul \ diff --git a/mozilla/content/shared/src/makefile.win b/mozilla/content/shared/src/makefile.win index 4de31d9ac46..d59d793ccfa 100644 --- a/mozilla/content/shared/src/makefile.win +++ b/mozilla/content/shared/src/makefile.win @@ -28,7 +28,6 @@ REQUIRES = xpcom \ locale \ dom \ webshell \ - docshell \ pref \ necko \ htmlparser \ diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win index b1e55257aff..22a4d7234a0 100644 --- a/mozilla/docshell/base/makefile.win +++ b/mozilla/docshell/base/makefile.win @@ -45,12 +45,10 @@ REQUIRES = xpcom \ webshell \ chardet \ uconv \ - appcomps \ content_xul \ find \ nkcache \ content \ - raptor \ gfx \ history \ $(NULL) diff --git a/mozilla/docshell/build/makefile.win b/mozilla/docshell/build/makefile.win index fd839f3caa7..b1997ae3f80 100644 --- a/mozilla/docshell/build/makefile.win +++ b/mozilla/docshell/build/makefile.win @@ -36,9 +36,7 @@ REQUIRES = xpcom \ intl \ htmlparser \ chardet \ - appcomps \ find \ - raptor \ gfx \ history \ $(NULL) diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win index 7eab76c4768..360471b603c 100644 --- a/mozilla/dom/src/base/makefile.win +++ b/mozilla/dom/src/base/makefile.win @@ -48,7 +48,6 @@ REQUIRES = xpcom \ locale \ uriloader \ sidebar \ - xuldoc \ timer \ webshell \ view \ diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index c412d401615..fa55d0c1ff1 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -30,11 +30,9 @@ REQUIRES = xpcom \ caps \ timer \ webBrowser_core \ - xuldoc \ docshell \ sidebar \ plugin \ - gkplugin \ necko \ gfx \ content \ @@ -43,7 +41,7 @@ REQUIRES = xpcom \ include <$(DEPTH)/config/config.mak> DEFINES=-D_IMPL_NS_DOM -INCLUDES=-I..\base +LINCS=-I..\base CPPSRCS = nsDOMFactory.cpp \ nsScriptNameSpaceManager.cpp diff --git a/mozilla/dom/src/jsurl/makefile.win b/mozilla/dom/src/jsurl/makefile.win index 8e3d042e05b..4173a8d8055 100644 --- a/mozilla/dom/src/jsurl/makefile.win +++ b/mozilla/dom/src/jsurl/makefile.win @@ -29,10 +29,8 @@ REQUIRES = xpcom \ caps \ widget \ appshell \ - rdf \ xpconnect \ jsconsole \ - raptor \ $(NULL) include <$(DEPTH)/config/config.mak> diff --git a/mozilla/editor/composer/src/makefile.win b/mozilla/editor/composer/src/makefile.win index 16f6e572129..b289573bbfb 100644 --- a/mozilla/editor/composer/src/makefile.win +++ b/mozilla/editor/composer/src/makefile.win @@ -50,21 +50,18 @@ REQUIRES = xpcom \ string \ dom \ layout \ - locale \ content \ uriloader \ txmgr \ htmlparser \ necko \ pref \ - view \ webshell \ timer \ intl \ docshell \ gfx \ widget \ - xuldoc \ txtsvc \ appshell \ appcomps \ diff --git a/mozilla/editor/libeditor/base/makefile.win b/mozilla/editor/libeditor/base/makefile.win index 94896c3ab2d..d9d6d5e0ee0 100644 --- a/mozilla/editor/libeditor/base/makefile.win +++ b/mozilla/editor/libeditor/base/makefile.win @@ -30,22 +30,14 @@ REQUIRES = xpcom \ layout \ content \ content_xul \ - uriloader \ txmgr \ htmlparser \ necko \ pref \ view \ appshell \ - rdf \ - webshell \ - timer \ - txtsvc \ - intl \ - docshell \ gfx \ widget \ - xuldoc \ $(NULL) CPPSRCS = \ diff --git a/mozilla/editor/libeditor/build/makefile.win b/mozilla/editor/libeditor/build/makefile.win index baa70aefd33..1bb83f7112c 100644 --- a/mozilla/editor/libeditor/build/makefile.win +++ b/mozilla/editor/libeditor/build/makefile.win @@ -27,23 +27,11 @@ REQUIRES = string \ xpcom \ dom \ layout \ - locale \ content \ - uriloader \ txmgr \ htmlparser \ necko \ - pref \ - view \ - webshell \ - timer \ - intl \ - docshell \ - gfx \ - widget \ appshell \ - xuldoc \ - txtsvc \ content_xul \ $(NULL) diff --git a/mozilla/editor/libeditor/text/makefile.win b/mozilla/editor/libeditor/text/makefile.win index cbf1ba3b815..51ab8c794b8 100644 --- a/mozilla/editor/libeditor/text/makefile.win +++ b/mozilla/editor/libeditor/text/makefile.win @@ -29,18 +29,12 @@ REQUIRES = xpcom \ locale \ layout \ content \ - uriloader \ txmgr \ htmlparser \ necko \ pref \ view \ - webshell \ - timer \ - txtsvc \ - intl \ lwbrk \ - docshell \ gfx \ widget \ $(NULL) diff --git a/mozilla/embedding/base/makefile.win b/mozilla/embedding/base/makefile.win index 25406d58cea..690e082305a 100644 --- a/mozilla/embedding/base/makefile.win +++ b/mozilla/embedding/base/makefile.win @@ -26,13 +26,8 @@ REQUIRES = xpcom \ widget \ view \ dom \ - necko \ - appshell \ uriloader \ - layout \ - editor \ intl \ - chrome \ timer \ gfx \ appstartup \ diff --git a/mozilla/embedding/browser/build/makefile.win b/mozilla/embedding/browser/build/makefile.win index 6b22dcee3e3..3d16a8691cc 100644 --- a/mozilla/embedding/browser/build/makefile.win +++ b/mozilla/embedding/browser/build/makefile.win @@ -36,7 +36,6 @@ REQUIRES = xpcom \ windowwatcher \ gfx \ content \ - mimetype \ webbrowserpersist \ $(NULL) diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win index 160158858ff..de7c2785e48 100644 --- a/mozilla/embedding/browser/webBrowser/makefile.win +++ b/mozilla/embedding/browser/webBrowser/makefile.win @@ -35,7 +35,6 @@ REQUIRES = xpcom \ timer \ windowwatcher \ wallet \ - appcomps \ gfx \ content \ history \ diff --git a/mozilla/embedding/components/windowwatcher/src/makefile.win b/mozilla/embedding/components/windowwatcher/src/makefile.win index 7d8dfa2fa1c..097d4d17512 100644 --- a/mozilla/embedding/components/windowwatcher/src/makefile.win +++ b/mozilla/embedding/components/windowwatcher/src/makefile.win @@ -28,7 +28,6 @@ REQUIRES = xpcom \ js \ xpconnect \ caps \ - layout \ content \ necko \ docshell \ diff --git a/mozilla/embedding/tests/winEmbed/makefile.win b/mozilla/embedding/tests/winEmbed/makefile.win index 3b7ae38da01..eec11e7fd2e 100644 --- a/mozilla/embedding/tests/winEmbed/makefile.win +++ b/mozilla/embedding/tests/winEmbed/makefile.win @@ -34,7 +34,6 @@ REQUIRES = xpcom \ necko \ docshell \ dom \ - gfx \ widget \ layout \ uriloader \ diff --git a/mozilla/extensions/transformiix/source/xslt/util/makefile.win b/mozilla/extensions/transformiix/source/xslt/util/makefile.win index 03b7e07aba1..3977e177595 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/makefile.win +++ b/mozilla/extensions/transformiix/source/xslt/util/makefile.win @@ -24,7 +24,6 @@ MODULE = transformiix REQUIRES = string \ xpcom \ dom \ - layout \ widget \ content \ locale \ diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win index 410271f6ff3..00444107acb 100644 --- a/mozilla/gfx/src/makefile.win +++ b/mozilla/gfx/src/makefile.win @@ -28,18 +28,11 @@ MODULE=gfx REQUIRES= xpcom \ string \ widget \ - util \ - dom \ locale \ view \ - uriloader \ pref \ - timer \ gfx2 \ imglib2 \ - mimetype \ - content \ - layout \ unicharutil \ $(NULL) diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win index 7b8ddc25de7..2fd0e3abaa6 100644 --- a/mozilla/htmlparser/robot/makefile.win +++ b/mozilla/htmlparser/robot/makefile.win @@ -32,7 +32,6 @@ REQUIRES = xpcom \ htmlparser \ necko \ docshell \ - dom \ uriloader \ $(NULL) diff --git a/mozilla/js/jsd/makefile.win b/mozilla/js/jsd/makefile.win index df316bba151..8d63175058d 100644 --- a/mozilla/js/jsd/makefile.win +++ b/mozilla/js/jsd/makefile.win @@ -31,7 +31,6 @@ REQUIRES = js \ string \ xpconnect \ widget \ - appshell \ dom \ !endif $(NULL) diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win index d2452d4a6f8..f1ca06a12e6 100644 --- a/mozilla/layout/base/tests/makefile.win +++ b/mozilla/layout/base/tests/makefile.win @@ -21,7 +21,6 @@ DEPTH=..\..\.. REQUIRES = xpcom \ - layout \ gfx \ $(NULL) MAKE_OBJ_TYPE = EXE diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index df0c2ce4921..5de9ff3c2fd 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -39,8 +39,6 @@ REQUIRES = xpcom \ editor \ intl \ uconv \ - exthandler \ - mimetype \ txmgr \ gfx2 \ imglib2 \ @@ -52,7 +50,6 @@ REQUIRES = xpcom \ gfx \ content \ content_xul \ - layout_xul \ $(NULL) CPPSRCS= \ diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index 7992205986f..7fb8c0642c4 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -35,7 +35,6 @@ REQUIRES = xpcom \ pref \ docshell \ plugin \ - gkplugin \ content_xul \ imglib2 \ gfx2 \ diff --git a/mozilla/layout/xul/base/src/grid/makefile.win b/mozilla/layout/xul/base/src/grid/makefile.win index 0438d353d53..d1fd72db7bd 100644 --- a/mozilla/layout/xul/base/src/grid/makefile.win +++ b/mozilla/layout/xul/base/src/grid/makefile.win @@ -25,18 +25,12 @@ LIBRARY_NAME=raptorxulgrid_s MODULE=layout_xul REQUIRES = xpcom \ string \ - dom \ widget \ - timer \ locale \ view \ - rdf \ necko \ - gfx2 \ - imglib2 \ gfx \ content \ - content_xul \ $(NULL) DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/mailnews/absync/build/makefile.win b/mozilla/mailnews/absync/build/makefile.win index 1e6e2cf4bd2..9956408566a 100644 --- a/mozilla/mailnews/absync/build/makefile.win +++ b/mozilla/mailnews/absync/build/makefile.win @@ -27,7 +27,6 @@ REQUIRES = xpcom \ msgbase \ intl \ addrbook \ - dom \ mork \ $(NULL) LIBRARY_NAME=absyncsv diff --git a/mozilla/mailnews/addrbook/src/makefile.win b/mozilla/mailnews/addrbook/src/makefile.win index 9f08e9315c3..512af6430d1 100644 --- a/mozilla/mailnews/addrbook/src/makefile.win +++ b/mozilla/mailnews/addrbook/src/makefile.win @@ -42,7 +42,6 @@ REQUIRES = xpcom \ mime \ msgcompo \ appcomps \ - gfx \ content \ mozldap \ intl \ diff --git a/mozilla/mailnews/base/build/makefile.win b/mozilla/mailnews/base/build/makefile.win index 191c66779c9..f2ec57ed3f4 100644 --- a/mozilla/mailnews/base/build/makefile.win +++ b/mozilla/mailnews/base/build/makefile.win @@ -49,8 +49,6 @@ REQUIRES = xpcom \ appshell \ msgnews \ msgimap \ - raptor \ - gfx \ layout_xul \ $(NULL) diff --git a/mozilla/mailnews/base/util/makefile.win b/mozilla/mailnews/base/util/makefile.win index 8b26836753c..b4dc2ebd437 100644 --- a/mozilla/mailnews/base/util/makefile.win +++ b/mozilla/mailnews/base/util/makefile.win @@ -42,7 +42,6 @@ REQUIRES = xpcom \ docshell \ webshell \ wallet \ - dom \ uriloader \ appshell \ msgimap \ @@ -55,7 +54,6 @@ REQUIRES = xpcom \ mimetype \ windowwatcher \ msgsearch \ - raptor \ $(NULL) include <$(DEPTH)\config\config.mak> diff --git a/mozilla/mailnews/compose/build/makefile.win b/mozilla/mailnews/compose/build/makefile.win index d5fd8b66de7..4cbcbc54e9f 100644 --- a/mozilla/mailnews/compose/build/makefile.win +++ b/mozilla/mailnews/compose/build/makefile.win @@ -40,7 +40,6 @@ REQUIRES = xpcom \ msgdb \ appshell \ nkcache \ - raptor \ $(NULL) ################################################################################ diff --git a/mozilla/mailnews/compose/src/makefile.win b/mozilla/mailnews/compose/src/makefile.win index bdc0796f5dd..a8629a5f0b6 100644 --- a/mozilla/mailnews/compose/src/makefile.win +++ b/mozilla/mailnews/compose/src/makefile.win @@ -36,7 +36,6 @@ REQUIRES = xpcom \ locale \ uconv \ unicharutil \ - layout \ msgbaseutil \ msgdb \ rdf \ diff --git a/mozilla/mailnews/imap/src/makefile.win b/mozilla/mailnews/imap/src/makefile.win index 5978a9fd0fb..c448f2b8026 100644 --- a/mozilla/mailnews/imap/src/makefile.win +++ b/mozilla/mailnews/imap/src/makefile.win @@ -39,7 +39,6 @@ REQUIRES = xpcom \ nkcache \ timer \ txmgr \ - dom \ docshell \ msglocal \ msgnews \ diff --git a/mozilla/mailnews/local/src/makefile.win b/mozilla/mailnews/local/src/makefile.win index c08fc7f6b3c..7f8341f8230 100644 --- a/mozilla/mailnews/local/src/makefile.win +++ b/mozilla/mailnews/local/src/makefile.win @@ -33,7 +33,6 @@ REQUIRES = xpcom \ rdf \ intl \ mime \ - dom \ rdfutil \ txmgr \ docshell \ diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win index ff1f428d005..c3bd9bea7dc 100644 --- a/mozilla/mailnews/mime/src/makefile.win +++ b/mozilla/mailnews/mime/src/makefile.win @@ -43,7 +43,6 @@ REQUIRES = xpcom \ uriloader \ xpconnect \ pipnss \ - windowwatcher \ $(NULL) include <$(DEPTH)\config\config.mak> diff --git a/mozilla/mailnews/news/build/makefile.win b/mozilla/mailnews/news/build/makefile.win index 42f6ebe837e..c99428e26a2 100644 --- a/mozilla/mailnews/news/build/makefile.win +++ b/mozilla/mailnews/news/build/makefile.win @@ -38,10 +38,8 @@ REQUIRES = xpcom \ pref \ uriloader \ nkcache \ - layout \ dom \ intl \ - raptor \ layout_xul \ $(NULL) diff --git a/mozilla/mailnews/news/src/makefile.win b/mozilla/mailnews/news/src/makefile.win index 9a0e17b48e0..9ad6e5971b7 100644 --- a/mozilla/mailnews/news/src/makefile.win +++ b/mozilla/mailnews/news/src/makefile.win @@ -34,7 +34,6 @@ REQUIRES = xpcom \ dom \ rdf \ docshell \ - layout \ pref \ uriloader \ appshell \ @@ -46,7 +45,6 @@ REQUIRES = xpcom \ rdfutil \ nkcache \ windowwatcher \ - raptor \ layout_xul \ $(NULL) diff --git a/mozilla/modules/libpr0n/decoders/gif/makefile.win b/mozilla/modules/libpr0n/decoders/gif/makefile.win index b9b872156c9..09764d27f4f 100644 --- a/mozilla/modules/libpr0n/decoders/gif/makefile.win +++ b/mozilla/modules/libpr0n/decoders/gif/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\..\.. MODULE = imggif REQUIRES = xpcom \ - necko \ gfx \ gfx2 \ imglib2 \ diff --git a/mozilla/modules/libpr0n/decoders/jpeg/makefile.win b/mozilla/modules/libpr0n/decoders/jpeg/makefile.win index 061e31de8f8..2f1e804e5ef 100644 --- a/mozilla/modules/libpr0n/decoders/jpeg/makefile.win +++ b/mozilla/modules/libpr0n/decoders/jpeg/makefile.win @@ -25,7 +25,6 @@ DEPTH=..\..\..\.. MODULE = imgjpeg REQUIRES = xpcom \ string \ - necko \ gfx \ gfx2 \ imglib2 \ diff --git a/mozilla/modules/libpr0n/decoders/png/makefile.win b/mozilla/modules/libpr0n/decoders/png/makefile.win index 3457eb50d76..a97e942b781 100644 --- a/mozilla/modules/libpr0n/decoders/png/makefile.win +++ b/mozilla/modules/libpr0n/decoders/png/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\..\.. MODULE = imgpng REQUIRES = xpcom \ - necko \ gfx \ gfx2 \ imglib2 \ diff --git a/mozilla/modules/libpr0n/decoders/ppm/makefile.win b/mozilla/modules/libpr0n/decoders/ppm/makefile.win index 5331f297828..97948d4970f 100644 --- a/mozilla/modules/libpr0n/decoders/ppm/makefile.win +++ b/mozilla/modules/libpr0n/decoders/ppm/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\..\.. MODULE = imgppm REQUIRES = xpcom \ - necko \ gfx2 \ imglib2 \ gfx \ diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index 42a816734e4..b88e25a8750 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -110,11 +110,7 @@ include <$(DEPTH)/config/rules.mak> LCFLAGS=$(LCFLAGS) ^ $(JAVA_DEFINES) -!if "$(MOZ_BITS)" == "32" PUBLIC_HEADER_DIR=$(PUBLIC)\ojiimpl -!else -PUBLIC_HEADER_DIR=$(PUBLIC)\win16 -!endif #export:: # $(MAKE_INSTALL) $(EXPORTS) $(PUBLIC_HEADER_DIR) diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win index 77be30ee5be..37f36f51cbc 100644 --- a/mozilla/modules/plugin/base/src/makefile.win +++ b/mozilla/modules/plugin/base/src/makefile.win @@ -34,7 +34,6 @@ REQUIRES = xpcom \ java \ pref \ necko \ - gtkxtbin \ webshell \ caps \ intl \ diff --git a/mozilla/netwerk/protocol/res/src/makefile.win b/mozilla/netwerk/protocol/res/src/makefile.win index 55e052d953f..9d15f27ca2b 100644 --- a/mozilla/netwerk/protocol/res/src/makefile.win +++ b/mozilla/netwerk/protocol/res/src/makefile.win @@ -23,8 +23,6 @@ DEPTH=..\..\..\.. MODULE=necko REQUIRES = xpcom \ string \ - exthandler \ - mimetype \ $(NULL) LIBRARY_NAME=nkres_s diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win index 7b8ddc25de7..2fd0e3abaa6 100644 --- a/mozilla/parser/htmlparser/robot/makefile.win +++ b/mozilla/parser/htmlparser/robot/makefile.win @@ -32,7 +32,6 @@ REQUIRES = xpcom \ htmlparser \ necko \ docshell \ - dom \ uriloader \ $(NULL) diff --git a/mozilla/profile/pref-migrator/src/makefile.win b/mozilla/profile/pref-migrator/src/makefile.win index 24472f508c8..8df6b938464 100644 --- a/mozilla/profile/pref-migrator/src/makefile.win +++ b/mozilla/profile/pref-migrator/src/makefile.win @@ -30,12 +30,10 @@ REQUIRES = xpcom \ docshell \ dom \ necko \ - rdf \ widget \ webBrowser_core \ uconv \ windowwatcher \ - raptor \ prefmigr \ $(NULL) include <$(DEPTH)/config/config.mak> diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win index f879c906401..8e8eb7e5dd3 100644 --- a/mozilla/rdf/build/makefile.win +++ b/mozilla/rdf/build/makefile.win @@ -25,7 +25,6 @@ LIBRARY_NAME=rdf MODULE_NAME=nsRDFModule REQUIRES = xpcom \ string \ - layout \ htmlparser \ necko \ content \ diff --git a/mozilla/rdf/chrome/build/makefile.win b/mozilla/rdf/chrome/build/makefile.win index 655e3c66b71..95e1d38ac56 100644 --- a/mozilla/rdf/chrome/build/makefile.win +++ b/mozilla/rdf/chrome/build/makefile.win @@ -29,8 +29,6 @@ REQUIRES = xpcom \ string \ rdf \ necko \ - layout \ - raptor \ content \ $(NULL) diff --git a/mozilla/rdf/tests/rdfcat/makefile.win b/mozilla/rdf/tests/rdfcat/makefile.win index 5a55333b17b..9c7abe241f1 100644 --- a/mozilla/rdf/tests/rdfcat/makefile.win +++ b/mozilla/rdf/tests/rdfcat/makefile.win @@ -29,7 +29,6 @@ REQUIRES = xpcom \ view \ dom \ uriloader \ - layout \ gfx \ $(NULL) MODULE=rdfcat diff --git a/mozilla/uriloader/base/makefile.win b/mozilla/uriloader/base/makefile.win index bd6caa7d799..25d6ee3c4ec 100644 --- a/mozilla/uriloader/base/makefile.win +++ b/mozilla/uriloader/base/makefile.win @@ -33,7 +33,6 @@ REQUIRES = xpcom \ intl \ webshell \ xpconnect \ - raptor \ content \ gfx \ $(NULL) diff --git a/mozilla/uriloader/exthandler/makefile.win b/mozilla/uriloader/exthandler/makefile.win index ff6638eb13b..fb6ba41eeec 100644 --- a/mozilla/uriloader/exthandler/makefile.win +++ b/mozilla/uriloader/exthandler/makefile.win @@ -30,8 +30,6 @@ REQUIRES = xpcom \ webshell \ helperAppDlg \ plugin \ - pref \ - raptor \ $(NULL) include <$(DEPTH)\config\config.mak> diff --git a/mozilla/webshell/tests/ComFactory/makefile.win b/mozilla/webshell/tests/ComFactory/makefile.win index 7d346b8c956..4334bfbc91d 100644 --- a/mozilla/webshell/tests/ComFactory/makefile.win +++ b/mozilla/webshell/tests/ComFactory/makefile.win @@ -21,7 +21,6 @@ IGNORE_MANIFEST = 1 DEPTH= ..\..\.. REQUIRES = xpcom \ - raptor \ webshell \ $(NULL) diff --git a/mozilla/widget/src/support/makefile.win b/mozilla/widget/src/support/makefile.win index 6e8a5c022dd..f7367131881 100644 --- a/mozilla/widget/src/support/makefile.win +++ b/mozilla/widget/src/support/makefile.win @@ -36,7 +36,6 @@ EXPORTS = \ MODULE=widget REQUIRES = xpcom \ string \ - layout \ gfx \ $(NULL) diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win index 4365f4f2ce5..c25a943b385 100644 --- a/mozilla/widget/src/xpwidgets/makefile.win +++ b/mozilla/widget/src/xpwidgets/makefile.win @@ -32,7 +32,6 @@ REQUIRES = xpcom \ locale \ necko \ htmlparser \ - webshell \ uconv \ unicharutil \ gfx \ diff --git a/mozilla/xpcom/glue/makefile.win b/mozilla/xpcom/glue/makefile.win index 81e9514cef7..7c3aa9985ea 100755 --- a/mozilla/xpcom/glue/makefile.win +++ b/mozilla/xpcom/glue/makefile.win @@ -24,8 +24,6 @@ MODULE = xpcom XPIDL_MODULE = xpcom_glue LIBRARY_NAME=xpcomglue -REQUIRES=string - ################################################################################ ## exports diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win index de2822005cf..4173f1d8060 100644 --- a/mozilla/xpfe/appshell/src/makefile.win +++ b/mozilla/xpfe/appshell/src/makefile.win @@ -39,10 +39,7 @@ REQUIRES = xpcom \ xpconnect \ timer \ intl \ - xul \ windowwatcher \ - browser \ - appcomps \ caps \ profile \ gfx \ diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win index 96811a6ca75..dc6583bdb13 100644 --- a/mozilla/xpfe/bootstrap/makefile.win +++ b/mozilla/xpfe/bootstrap/makefile.win @@ -29,7 +29,6 @@ REQUIRES = xpcom \ necko \ pref \ appshell \ - layout \ chrome \ xpinstall \ xpicleanup \ @@ -42,8 +41,6 @@ REQUIRES = xpcom \ mozbrwsr \ appcomps \ docshell \ - xremoteservice \ - raptor \ gfx \ intl \ profile \ diff --git a/mozilla/xpfe/browser/src/makefile.win b/mozilla/xpfe/browser/src/makefile.win index 0ca8d145627..c187e3c79bd 100644 --- a/mozilla/xpfe/browser/src/makefile.win +++ b/mozilla/xpfe/browser/src/makefile.win @@ -45,7 +45,6 @@ REQUIRES = xpcom \ uconv \ chardet \ windowwatcher \ - raptor \ urlbarhistory \ content \ gfx \ diff --git a/mozilla/xpfe/components/autocomplete/src/makefile.win b/mozilla/xpfe/components/autocomplete/src/makefile.win index 0b039ca0450..28b339620c6 100644 --- a/mozilla/xpfe/components/autocomplete/src/makefile.win +++ b/mozilla/xpfe/components/autocomplete/src/makefile.win @@ -31,7 +31,6 @@ DEPTH = ..\..\..\.. MODULE=appcomps REQUIRES = xpcom \ string \ - layout \ dom \ mozldap \ necko \ diff --git a/mozilla/xpfe/components/build/makefile.win b/mozilla/xpfe/components/build/makefile.win index 07758bca155..74c7dd4d23e 100644 --- a/mozilla/xpfe/components/build/makefile.win +++ b/mozilla/xpfe/components/build/makefile.win @@ -25,7 +25,6 @@ LIBRARY_NAME=appcomps MODULE_NAME=application REQUIRES = xpcom \ string \ - layout \ rdf \ necko \ necko2 \ @@ -40,7 +39,6 @@ REQUIRES = xpcom \ webshell \ bookmarks \ content \ - raptor \ history \ search \ related \ diff --git a/mozilla/xpfe/components/directory/makefile.win b/mozilla/xpfe/components/directory/makefile.win index 83cfcec75c5..3c4adfccdbf 100644 --- a/mozilla/xpfe/components/directory/makefile.win +++ b/mozilla/xpfe/components/directory/makefile.win @@ -42,7 +42,6 @@ REQUIRES = xpcom \ necko \ necko2 \ rdf \ - layout \ timer \ js \ xpconnect \ @@ -55,7 +54,6 @@ REQUIRES = xpcom \ uriloader \ windowwatcher \ content \ - raptor \ $(NULL) XPIDL_MODULE=directory diff --git a/mozilla/xpinstall/src/makefile.win b/mozilla/xpinstall/src/makefile.win index 20d681f782a..28c1aedc463 100644 --- a/mozilla/xpinstall/src/makefile.win +++ b/mozilla/xpinstall/src/makefile.win @@ -41,7 +41,6 @@ REQUIRES = xpcom \ js \ pref \ widget \ - layout \ uriloader \ xpconnect \ docshell \ diff --git a/mozilla/xpinstall/stub/makefile.win b/mozilla/xpinstall/stub/makefile.win index 6fdc45b2614..f674e989a4a 100644 --- a/mozilla/xpinstall/stub/makefile.win +++ b/mozilla/xpinstall/stub/makefile.win @@ -26,8 +26,6 @@ DEPTH=..\.. REQUIRES = xpcom \ string \ dom \ - appshell \ - appcomps \ xpinstall \ $(NULL) MAKE_OBJ_TYPE = DLL