From bc91d919a7a0684cae9ff1e16d8bbcc18820fa7e Mon Sep 17 00:00:00 2001 From: "jag%tty.nl" Date: Mon, 18 Feb 2008 08:50:33 +0000 Subject: [PATCH] Bug 73353: Clean up our MODULE/REQUIRES story. rs=dbaron, a=brendan git-svn-id: svn://10.0.0.236/trunk@245897 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/Makefile.in | 1 - mozilla/browser/components/build/Makefile.in | 6 ----- .../components/migration/src/Makefile.in | 1 - .../browser/components/places/src/Makefile.in | 1 - .../components/safebrowsing/src/Makefile.in | 1 - .../browser/components/shell/src/Makefile.in | 11 +++++--- mozilla/content/base/src/Makefile.in | 6 +++-- mozilla/content/canvas/src/Makefile.in | 11 -------- mozilla/content/html/document/src/Makefile.in | 3 --- .../content/mathml/content/src/Makefile.in | 3 --- mozilla/content/svg/content/src/Makefile.in | 3 --- mozilla/content/svg/document/src/Makefile.in | 5 +--- mozilla/content/xbl/src/Makefile.in | 1 - mozilla/content/xml/content/src/Makefile.in | 3 --- mozilla/content/xml/document/src/Makefile.in | 3 --- mozilla/content/xul/content/src/Makefile.in | 2 -- mozilla/content/xul/document/src/Makefile.in | 2 -- mozilla/docshell/base/Makefile.in | 1 - mozilla/docshell/build/Makefile.in | 3 --- mozilla/dom/src/base/Makefile.in | 1 - mozilla/dom/src/json/Makefile.in | 3 --- mozilla/editor/composer/src/Makefile.in | 1 - mozilla/editor/libeditor/text/Makefile.in | 1 - mozilla/editor/txtsvc/src/Makefile.in | 1 - mozilla/embedding/browser/build/Makefile.in | 1 - .../components/commandhandler/src/Makefile.in | 2 -- mozilla/extensions/cookie/Makefile.in | 2 -- .../extensions/layout-debug/src/Makefile.in | 6 +++-- mozilla/extensions/wallet/editor/Makefile.in | 1 - .../wallet/signonviewer/Makefile.in | 1 - .../wallet/walletpreview/Makefile.in | 2 -- .../xmlextras/build/src/Makefile.in | 3 --- .../extensions/xmlextras/tests/Makefile.in | 1 - mozilla/gfx/src/Makefile.in | 3 --- mozilla/gfx/src/shared/Makefile.in | 5 ---- mozilla/gfx/src/thebes/Makefile.in | 18 +++---------- mozilla/gfx/thebes/src/Makefile.in | 1 - mozilla/intl/build/Makefile.in | 1 - mozilla/intl/locale/src/Makefile.in | 1 - mozilla/intl/unicharutil/util/Makefile.in | 1 - mozilla/layout/base/Makefile.in | 6 ++--- mozilla/layout/build/Makefile.in | 2 -- mozilla/layout/forms/Makefile.in | 7 +++--- mozilla/layout/generic/Makefile.in | 10 +++----- mozilla/layout/inspector/src/Makefile.in | 1 - mozilla/layout/mathml/base/src/Makefile.in | 2 -- mozilla/layout/printing/Makefile.in | 1 - mozilla/layout/style/Makefile.in | 2 -- mozilla/layout/svg/base/src/Makefile.in | 2 -- mozilla/layout/tables/Makefile.in | 6 +++-- mozilla/layout/xul/base/src/Makefile.in | 1 - .../layout/xul/base/src/tree/src/Makefile.in | 1 - mozilla/mailnews/addrbook/src/Makefile.in | 1 - mozilla/mailnews/base/util/Makefile.in | 2 -- mozilla/mailnews/build/Makefile.in | 7 ------ mozilla/mailnews/compose/src/Makefile.in | 9 +++---- .../bayesian-spam-filter/src/Makefile.in | 1 - .../extensions/mailviews/src/Makefile.in | 2 -- .../mailnews/extensions/mdn/src/Makefile.in | 1 - .../extensions/smime/build/Makefile.in | 1 - .../mailnews/extensions/smime/src/Makefile.in | 1 - mozilla/mailnews/import/build/Makefile.in | 10 -------- .../mailnews/import/eudora/src/Makefile.in | 3 --- mozilla/mailnews/import/src/Makefile.in | 2 -- mozilla/mailnews/import/text/src/Makefile.in | 1 - mozilla/mailnews/local/src/Makefile.in | 1 - mozilla/mailnews/mime/src/Makefile.in | 1 - mozilla/mailnews/news/src/Makefile.in | 1 - mozilla/modules/libpr0n/build/Makefile.in | 2 -- .../modules/libpr0n/decoders/gif/Makefile.in | 1 - .../modules/libpr0n/encoders/jpeg/Makefile.in | 1 - .../modules/libpr0n/encoders/png/Makefile.in | 1 - mozilla/modules/libpr0n/src/Makefile.in | 1 - mozilla/modules/libpref/src/Makefile.in | 5 +++- mozilla/netwerk/protocol/file/src/Makefile.in | 1 - .../netwerk/protocol/gopher/src/Makefile.in | 2 -- .../protocol/viewsource/src/Makefile.in | 1 - mozilla/storage/build/Makefile.in | 2 -- mozilla/storage/src/Makefile.in | 2 -- mozilla/storage/test/Makefile.in | 1 - mozilla/suite/app/Makefile.in | 1 - mozilla/suite/browser/src/Makefile.in | 4 --- mozilla/suite/build/Makefile.in | 5 ---- .../suite/profile/migration/src/Makefile.in | 3 --- .../components/alerts/src/mac/Makefile.in | 1 - mozilla/toolkit/components/build/Makefile.in | 13 ++++------ .../components/downloads/src/Makefile.in | 3 +-- .../toolkit/components/feeds/src/Makefile.in | 1 - .../toolkit/components/places/src/Makefile.in | 10 -------- .../components/satchel/src/Makefile.in | 5 ---- mozilla/toolkit/crashreporter/Makefile.in | 1 - .../toolkit/crashreporter/client/Makefile.in | 3 ++- .../mozapps/update/src/updater/Makefile.in | 6 ++++- mozilla/toolkit/xre/Makefile.in | 4 --- mozilla/widget/src/cocoa/Makefile.in | 2 -- mozilla/widget/src/support/Makefile.in | 1 - mozilla/widget/src/xpwidgets/Makefile.in | 1 - .../xpfe/bootstrap/appleevents/Makefile.in | 1 - mozilla/xpfe/browser/src/Makefile.in | 3 --- .../components/autocomplete/src/Makefile.in | 1 - mozilla/xpfe/components/build/Makefile.in | 25 ++++++------------- mozilla/xpfe/components/directory/Makefile.in | 1 - .../download-manager/src/Makefile.in | 2 -- mozilla/xpfe/components/intl/Makefile.in | 5 ---- 104 files changed, 64 insertions(+), 266 deletions(-) diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index 82ba822640e..3501b27341c 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -92,7 +92,6 @@ endif REQUIRES = \ xpcom \ string \ - xulapp \ $(NULL) CPPSRCS = nsBrowserApp.cpp diff --git a/mozilla/browser/components/build/Makefile.in b/mozilla/browser/components/build/Makefile.in index ad6cc39848d..80cd78fcbe2 100644 --- a/mozilla/browser/components/build/Makefile.in +++ b/mozilla/browser/components/build/Makefile.in @@ -17,18 +17,12 @@ FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 REQUIRES = \ - docshell \ xpcom \ string \ - pref \ rdf \ uriloader \ - webbrowserpersist \ intl \ necko \ - nkcache \ - txmgr \ - chardet \ migration \ shellservice \ xulapp \ diff --git a/mozilla/browser/components/migration/src/Makefile.in b/mozilla/browser/components/migration/src/Makefile.in index e8046c8a906..66012e18ec9 100644 --- a/mozilla/browser/components/migration/src/Makefile.in +++ b/mozilla/browser/components/migration/src/Makefile.in @@ -51,7 +51,6 @@ REQUIRES = \ xpcom \ string \ necko \ - history \ libreg \ browsercomps \ toolkitcomps \ diff --git a/mozilla/browser/components/places/src/Makefile.in b/mozilla/browser/components/places/src/Makefile.in index 8feea36118f..a30e6ffecec 100644 --- a/mozilla/browser/components/places/src/Makefile.in +++ b/mozilla/browser/components/places/src/Makefile.in @@ -53,7 +53,6 @@ USE_STATIC_LIBS = 1 REQUIRES = \ xpcom \ string \ - docshell \ necko \ browsercomps \ toolkitcomps \ diff --git a/mozilla/browser/components/safebrowsing/src/Makefile.in b/mozilla/browser/components/safebrowsing/src/Makefile.in index 68404475329..e0f3fac827a 100644 --- a/mozilla/browser/components/safebrowsing/src/Makefile.in +++ b/mozilla/browser/components/safebrowsing/src/Makefile.in @@ -49,7 +49,6 @@ USE_STATIC_LIBS = 1 REQUIRES = \ necko \ - safebrowsing \ string \ uriloader \ xpcom diff --git a/mozilla/browser/components/shell/src/Makefile.in b/mozilla/browser/components/shell/src/Makefile.in index 56d4764357f..6b971ad697a 100644 --- a/mozilla/browser/components/shell/src/Makefile.in +++ b/mozilla/browser/components/shell/src/Makefile.in @@ -54,13 +54,10 @@ REQUIRES = \ webbrowserpersist \ dom \ intl \ - unicharutil \ necko \ content \ imglib2 \ - browsercomps \ gfx \ - thebes \ widget \ pref \ layout \ @@ -68,13 +65,19 @@ REQUIRES = \ ifeq ($(OS_ARCH),WINNT) CPPSRCS = nsWindowsShellService.cpp +REQUIRES += \ + browsercomps \ + $(NULL) else ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) CPPSRCS = nsMacShellService.cpp else ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) CPPSRCS = nsGNOMEShellService.cpp -REQUIRES += mozgnome +REQUIRES += \ + mozgnome \ + thebes \ + $(NULL) endif endif endif diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in index 3b9d3be20cb..f1e627f8c39 100644 --- a/mozilla/content/base/src/Makefile.in +++ b/mozilla/content/base/src/Makefile.in @@ -59,7 +59,6 @@ REQUIRES = xpcom \ js \ webshell \ necko \ - nkcache \ mimetype \ exthandler \ chardet \ @@ -82,9 +81,12 @@ REQUIRES = xpcom \ util \ appshell \ shistory \ - accessibility \ $(NULL) +ifdef ACCESSIBILITY +REQUIRES += accessibility +endif + EXPORTS = \ nsAtomListUtils.h \ nsAttrName.h \ diff --git a/mozilla/content/canvas/src/Makefile.in b/mozilla/content/canvas/src/Makefile.in index f77a8d907ed..ce6863d5ab0 100644 --- a/mozilla/content/canvas/src/Makefile.in +++ b/mozilla/content/canvas/src/Makefile.in @@ -57,24 +57,13 @@ REQUIRES = \ locale \ unicharutil \ webshell \ - uriloader \ - htmlparser \ necko \ - view \ pref \ docshell \ xpconnect \ - xuldoc \ caps \ - editor \ imglib2 \ - mimetype \ - exthandler \ - uconv \ - intl \ - plugin \ cairo \ - libpixman \ thebes \ $(NULL) diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in index a9b8b592304..018f832056c 100644 --- a/mozilla/content/html/document/src/Makefile.in +++ b/mozilla/content/html/document/src/Makefile.in @@ -65,11 +65,8 @@ REQUIRES = xpcom \ util \ uconv \ pref \ - uriloader \ - rdf \ chardet \ nkcache \ - lwbrk \ imglib2 \ xpconnect \ unicharutil \ diff --git a/mozilla/content/mathml/content/src/Makefile.in b/mozilla/content/mathml/content/src/Makefile.in index 9d62c66d299..ccb5a84d43a 100644 --- a/mozilla/content/mathml/content/src/Makefile.in +++ b/mozilla/content/mathml/content/src/Makefile.in @@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ layout \ - content \ widget \ gfx \ dom \ @@ -57,8 +56,6 @@ REQUIRES = xpcom \ locale \ pref \ webshell \ - unicharutil \ - docshell \ thebes \ $(NULL) diff --git a/mozilla/content/svg/content/src/Makefile.in b/mozilla/content/svg/content/src/Makefile.in index b581402e4e6..8c1a0805fcc 100644 --- a/mozilla/content/svg/content/src/Makefile.in +++ b/mozilla/content/svg/content/src/Makefile.in @@ -49,14 +49,11 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ layout \ - content \ widget \ gfx \ dom \ js \ locale \ - htmlparser \ - view \ pref \ necko \ xpconnect \ diff --git a/mozilla/content/svg/document/src/Makefile.in b/mozilla/content/svg/document/src/Makefile.in index 845afae278b..17f28e5c81d 100644 --- a/mozilla/content/svg/document/src/Makefile.in +++ b/mozilla/content/svg/document/src/Makefile.in @@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkconsvgdoc_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ +REQUIRES = \ layout \ widget \ xpcom \ @@ -55,14 +55,11 @@ REQUIRES = content \ dom \ webshell \ htmlparser \ - lwbrk \ necko \ pref \ js \ caps \ locale \ - view \ - xpconnect \ $(NULL) CPPSRCS = \ diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index ae320224a12..2312809a346 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -62,7 +62,6 @@ REQUIRES = xpcom \ pref \ docshell \ webshell \ - lwbrk \ xuldoc \ rdf \ imglib2 \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 8c0e7109d6e..a3d2c8f815b 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -55,11 +55,8 @@ REQUIRES = xpcom \ layout \ widget \ necko \ - caps \ webshell \ docshell \ - htmlparser \ - xpconnect \ unicharutil \ pref \ locale \ diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index eb28fbb5094..e5f19e5daa7 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -57,15 +57,12 @@ REQUIRES = xpcom \ caps \ htmlparser \ necko \ - view \ imglib2 \ docshell \ webshell \ - uriloader \ pref \ xpconnect \ uconv \ - lwbrk \ exthandler \ mimetype \ unicharutil \ diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index 2bb29d4903f..7529a983f6c 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/content/xul/content/src/Makefile.in @@ -64,12 +64,10 @@ REQUIRES = xpcom \ xpconnect \ pref \ locale \ - lwbrk \ xuldoc \ xultmpl \ webshell \ view \ - docshell \ htmlparser \ $(NULL) diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in index ffab2fa01e2..e131e0e9db7 100644 --- a/mozilla/content/xul/document/src/Makefile.in +++ b/mozilla/content/xul/document/src/Makefile.in @@ -63,9 +63,7 @@ REQUIRES = xpcom \ locale \ view \ necko \ - uriloader \ htmlparser \ - lwbrk \ docshell \ pref \ xultmpl \ diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 7e4e1ac00b4..0a1377d78be 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -84,7 +84,6 @@ REQUIRES = xpcom \ editor \ windowwatcher \ imglib2 \ - mimetype \ jar \ $(NULL) diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in index d2019f9585a..f8f52e50e65 100644 --- a/mozilla/docshell/build/Makefile.in +++ b/mozilla/docshell/build/Makefile.in @@ -57,7 +57,6 @@ PACKAGE_FILE = docshell.pkg REQUIRES = xpcom \ string \ dom \ - js \ shistory \ necko \ nkcache \ @@ -68,7 +67,6 @@ REQUIRES = xpcom \ webshell \ widget \ pref \ - view \ intl \ htmlparser \ chardet \ @@ -79,7 +77,6 @@ REQUIRES = xpcom \ uriloader \ exthandler \ mimetype \ - rdf \ prefetch \ imglib2 \ $(NULL) diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index f6d2b2d4e4b..6c3cbe4e8fc 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -66,7 +66,6 @@ REQUIRES = xpcom \ mimetype \ java \ locale \ - uriloader \ prefetch \ xuldoc \ webshell \ diff --git a/mozilla/dom/src/json/Makefile.in b/mozilla/dom/src/json/Makefile.in index fc532d18e03..9d6b38455b2 100644 --- a/mozilla/dom/src/json/Makefile.in +++ b/mozilla/dom/src/json/Makefile.in @@ -49,14 +49,11 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ content \ - caps \ js \ - locale \ layout \ necko \ pref \ uconv \ - unicharutil \ widget \ xpconnect \ $(NULL) diff --git a/mozilla/editor/composer/src/Makefile.in b/mozilla/editor/composer/src/Makefile.in index 6202777b0fe..a75f2b63fa2 100644 --- a/mozilla/editor/composer/src/Makefile.in +++ b/mozilla/editor/composer/src/Makefile.in @@ -55,7 +55,6 @@ REQUIRES = xpcom \ string \ unicharutil \ dom \ - js \ layout \ content \ uriloader \ diff --git a/mozilla/editor/libeditor/text/Makefile.in b/mozilla/editor/libeditor/text/Makefile.in index cecd5d02fc3..17d775c0911 100644 --- a/mozilla/editor/libeditor/text/Makefile.in +++ b/mozilla/editor/libeditor/text/Makefile.in @@ -54,7 +54,6 @@ REQUIRES = xpcom \ content \ txmgr \ txtsvc \ - htmlparser \ necko \ pref \ lwbrk \ diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index a38d2d6b010..8bfbfa4f24d 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/editor/txtsvc/src/Makefile.in @@ -52,7 +52,6 @@ REQUIRES = xpcom \ string \ editor \ gfx \ - thebes \ layout \ content \ dom \ diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in index 11dfe504f93..4c77c493029 100644 --- a/mozilla/embedding/browser/build/Makefile.in +++ b/mozilla/embedding/browser/build/Makefile.in @@ -59,7 +59,6 @@ REQUIRES = xpcom \ dom \ widget \ gfx \ - layout \ content \ necko \ uriloader \ diff --git a/mozilla/embedding/components/commandhandler/src/Makefile.in b/mozilla/embedding/components/commandhandler/src/Makefile.in index aeb13f1fe8e..41039aace05 100644 --- a/mozilla/embedding/components/commandhandler/src/Makefile.in +++ b/mozilla/embedding/components/commandhandler/src/Makefile.in @@ -48,12 +48,10 @@ REQUIRES = string \ dom \ content \ widget \ - necko \ xuldoc \ caps \ xpconnect \ js \ - layout \ $(NULL) LIBRARY_NAME = commandhandler_s diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index 4f6c427c8ec..e1ea6e6f16b 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -56,8 +56,6 @@ REQUIRES = xpcom \ string \ necko \ dom \ - widget \ - content \ pref \ windowwatcher \ docshell \ diff --git a/mozilla/extensions/layout-debug/src/Makefile.in b/mozilla/extensions/layout-debug/src/Makefile.in index dffb1024c8a..d2bb4122af4 100644 --- a/mozilla/extensions/layout-debug/src/Makefile.in +++ b/mozilla/extensions/layout-debug/src/Makefile.in @@ -63,11 +63,13 @@ REQUIRES = xpcom \ locale \ view \ pref \ - appshell \ - appcomps \ toolkitcomps \ $(NULL) +ifndef MOZ_XUL_APP +REQUIRES += appcomps +endif + XPIDLSRCS = \ nsILayoutRegressionTester.idl \ nsILayoutDebuggingTools.idl \ diff --git a/mozilla/extensions/wallet/editor/Makefile.in b/mozilla/extensions/wallet/editor/Makefile.in index b333d0de0c7..025f24588ea 100644 --- a/mozilla/extensions/wallet/editor/Makefile.in +++ b/mozilla/extensions/wallet/editor/Makefile.in @@ -52,7 +52,6 @@ REQUIRES = xpcom \ wallet \ dom \ docshell \ - widget \ $(NULL) CPPSRCS = nsWalletEditor.cpp diff --git a/mozilla/extensions/wallet/signonviewer/Makefile.in b/mozilla/extensions/wallet/signonviewer/Makefile.in index d84b3f222cd..8232af7c1a6 100644 --- a/mozilla/extensions/wallet/signonviewer/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/Makefile.in @@ -51,7 +51,6 @@ REQUIRES = xpcom \ string \ wallet \ dom \ - widget \ $(NULL) CPPSRCS = nsSignonViewer.cpp diff --git a/mozilla/extensions/wallet/walletpreview/Makefile.in b/mozilla/extensions/wallet/walletpreview/Makefile.in index bb3fc105974..50318fc97dd 100644 --- a/mozilla/extensions/wallet/walletpreview/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/Makefile.in @@ -52,8 +52,6 @@ REQUIRES = xpcom \ wallet \ dom \ content \ - layout \ - necko \ widget \ docshell \ $(NULL) diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in index f3eb5ba1050..e4946c261f7 100644 --- a/mozilla/extensions/xmlextras/build/src/Makefile.in +++ b/mozilla/extensions/xmlextras/build/src/Makefile.in @@ -60,9 +60,6 @@ REQUIRES = xpcom \ dom \ js \ content \ - widget \ - necko \ - embedcomponents \ xpconnect \ $(NULL) diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in index 09b790bfb90..74e8ef9ae7a 100644 --- a/mozilla/extensions/xmlextras/tests/Makefile.in +++ b/mozilla/extensions/xmlextras/tests/Makefile.in @@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk REQUIRES = xpcom \ string \ - xmlextras \ necko \ dom \ content \ diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 36bbc188113..af4b4e40284 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -51,13 +51,10 @@ LIBXUL_LIBRARY = 1 PACKAGE_FILE = gfx.pkg REQUIRES = xpcom \ - windowwatcher \ - dom \ string \ widget \ locale \ view \ - pref \ unicharutil \ thebes \ $(NULL) diff --git a/mozilla/gfx/src/shared/Makefile.in b/mozilla/gfx/src/shared/Makefile.in index abdd11eaa26..12105b50fb7 100644 --- a/mozilla/gfx/src/shared/Makefile.in +++ b/mozilla/gfx/src/shared/Makefile.in @@ -53,11 +53,6 @@ REQUIRES= \ string \ imglib2 \ widget \ - content \ - layout \ - necko \ - dom \ - locale \ thebes \ $(NULL) diff --git a/mozilla/gfx/src/thebes/Makefile.in b/mozilla/gfx/src/thebes/Makefile.in index 7222bcf2253..61bd8178e54 100644 --- a/mozilla/gfx/src/thebes/Makefile.in +++ b/mozilla/gfx/src/thebes/Makefile.in @@ -55,25 +55,12 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ - cairo \ - libpixman \ - glitz \ thebes \ - gfx \ widget \ - intl \ view \ pref \ - uconv \ unicharutil \ - locale \ - necko \ - content \ - layout \ - dom \ - debug \ imglib2 \ - widget \ $(ZLIB_REQUIRES) \ $(NULL) @@ -103,7 +90,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) CPPSRCS += nsSystemFontsWin.cpp \ $(NULL) -REQUIRES += glitzwgl +REQUIRES += \ + glitzwgl \ + cairo \ + $(NULL) _OS_LIBS = usp10 OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS)) diff --git a/mozilla/gfx/thebes/src/Makefile.in b/mozilla/gfx/thebes/src/Makefile.in index cf1e3348f26..c2c8d5a7a56 100644 --- a/mozilla/gfx/thebes/src/Makefile.in +++ b/mozilla/gfx/thebes/src/Makefile.in @@ -13,7 +13,6 @@ EXPORT_LIBRARY = 1 REQUIRES = \ cairo \ - libpixman \ string \ pref \ xpcom \ diff --git a/mozilla/intl/build/Makefile.in b/mozilla/intl/build/Makefile.in index 34bb4b1e1e6..bc1f86ae61a 100644 --- a/mozilla/intl/build/Makefile.in +++ b/mozilla/intl/build/Makefile.in @@ -59,7 +59,6 @@ REQUIRES = xpcom \ lwbrk \ intl \ locale \ - necko \ $(NULL) CPPSRCS = \ diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in index 8346b58b383..a404697b135 100644 --- a/mozilla/intl/locale/src/Makefile.in +++ b/mozilla/intl/locale/src/Makefile.in @@ -47,7 +47,6 @@ LIBRARY_NAME = nslocale_s LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ - gfx \ string \ uconv \ unicharutil \ diff --git a/mozilla/intl/unicharutil/util/Makefile.in b/mozilla/intl/unicharutil/util/Makefile.in index b4e195ec1a6..ea77ad20ded 100644 --- a/mozilla/intl/unicharutil/util/Makefile.in +++ b/mozilla/intl/unicharutil/util/Makefile.in @@ -57,7 +57,6 @@ SDK_LIBRARY = $(LIBRARY) REQUIRES=xpcom \ string \ - uconv \ $(NULL) SDK_HEADERS = \ diff --git a/mozilla/layout/base/Makefile.in b/mozilla/layout/base/Makefile.in index ee20f20c283..9db0ff8cfd7 100644 --- a/mozilla/layout/base/Makefile.in +++ b/mozilla/layout/base/Makefile.in @@ -56,7 +56,6 @@ REQUIRES = xpcom \ string \ dom \ content \ - xul \ xuldoc \ gfx \ widget \ @@ -76,13 +75,14 @@ REQUIRES = xpcom \ htmlparser \ util \ windowwatcher \ - accessibility \ shistory \ caps \ thebes \ - cairo \ $(NULL) +ifdef ACCESSIBILITY +REQUIRES += accessibility +endif XPIDLSRCS = \ nsIStyleSheetService.idl \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 37d644b09a7..6422abd8b1c 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -83,14 +83,12 @@ REQUIRES = xpcom \ htmlparser \ js \ xpconnect \ - uriloader \ caps \ rdf \ xuldoc \ imglib2 \ pref \ unicharutil \ - xul \ xultmpl \ lwbrk \ plugin \ diff --git a/mozilla/layout/forms/Makefile.in b/mozilla/layout/forms/Makefile.in index 09a601c2c92..ad9af9933a0 100644 --- a/mozilla/layout/forms/Makefile.in +++ b/mozilla/layout/forms/Makefile.in @@ -64,13 +64,10 @@ REQUIRES = xpcom \ necko \ webshell \ editor \ - txtsvc \ - intl \ uconv \ txmgr \ xuldoc \ imglib2 \ - accessibility \ unicharutil \ commandhandler \ xpconnect \ @@ -79,6 +76,10 @@ REQUIRES = xpcom \ docshell \ $(NULL) +ifdef ACCESSIBILITY +REQUIRES += accessibility +endif + EXPORTS = \ nsIListControlFrame.h \ nsIComboboxControlFrame.h \ diff --git a/mozilla/layout/generic/Makefile.in b/mozilla/layout/generic/Makefile.in index d3d2d04fe87..528ad19e3a4 100644 --- a/mozilla/layout/generic/Makefile.in +++ b/mozilla/layout/generic/Makefile.in @@ -54,7 +54,6 @@ REQUIRES = xpcom \ dom \ content \ thebes \ - cairo \ gfx \ widget \ locale \ @@ -67,23 +66,22 @@ REQUIRES = xpcom \ webshell \ plugin \ docshell \ - uriloader \ - mimetype \ webbrwsr \ oji \ unicharutil \ lwbrk \ imglib2 \ - accessibility \ xpconnect \ java \ - exthandler \ intl \ - uconv \ thebes \ cairo \ $(NULL) +ifdef ACCESSIBILITY +REQUIRES += accessibility +endif + # Sun's Complex Text Layout support ifdef SUNCTL REQUIRES += ctl diff --git a/mozilla/layout/inspector/src/Makefile.in b/mozilla/layout/inspector/src/Makefile.in index 0d0bf613883..9ca229db2e8 100644 --- a/mozilla/layout/inspector/src/Makefile.in +++ b/mozilla/layout/inspector/src/Makefile.in @@ -57,7 +57,6 @@ REQUIRES = xpcom \ locale \ necko \ docshell \ - view \ webshell \ $(NULL) diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index a09504b9a4b..28af5fc4832 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -60,12 +60,10 @@ REQUIRES = xpcom \ view \ webshell \ locale \ - intl \ unicharutil \ necko \ docshell \ webbrwsr \ - windowwatcher \ pref \ js \ $(NULL) diff --git a/mozilla/layout/printing/Makefile.in b/mozilla/layout/printing/Makefile.in index da2b6f5964b..8c169dc4129 100644 --- a/mozilla/layout/printing/Makefile.in +++ b/mozilla/layout/printing/Makefile.in @@ -66,7 +66,6 @@ REQUIRES = xpcom \ windowwatcher \ htmlparser \ js \ - xpconnect \ pref \ $(NULL) diff --git a/mozilla/layout/style/Makefile.in b/mozilla/layout/style/Makefile.in index 264678fb557..745c989ff47 100644 --- a/mozilla/layout/style/Makefile.in +++ b/mozilla/layout/style/Makefile.in @@ -65,8 +65,6 @@ REQUIRES = xpcom \ necko \ mimetype \ webshell \ - docshell \ - htmlparser \ uconv \ xuldoc \ xpconnect \ diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index f85e592fffb..2a406759581 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/layout/svg/base/src/Makefile.in @@ -59,8 +59,6 @@ REQUIRES = xpcom \ unicharutil \ webshell \ imglib2 \ - intl \ - windowwatcher \ js \ xpconnect \ docshell \ diff --git a/mozilla/layout/tables/Makefile.in b/mozilla/layout/tables/Makefile.in index 3e770aacd4e..5efb1d02ee5 100644 --- a/mozilla/layout/tables/Makefile.in +++ b/mozilla/layout/tables/Makefile.in @@ -55,15 +55,17 @@ REQUIRES = xpcom \ widget \ locale \ view \ - accessibility \ necko \ webshell \ js \ - xpconnect \ pref \ docshell \ $(NULL) +ifdef ACCESSIBILITY +REQUIRES += accessibility +endif + EXPORTS = \ nsITableCellLayout.h \ nsITableLayout.h \ diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 195d9892631..2fe5e770752 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -51,7 +51,6 @@ REQUIRES = xpcom \ dom \ locale \ content \ - xul \ gfx \ thebes \ widget \ diff --git a/mozilla/layout/xul/base/src/tree/src/Makefile.in b/mozilla/layout/xul/base/src/tree/src/Makefile.in index ca67702648f..b4c2f44d10c 100644 --- a/mozilla/layout/xul/base/src/tree/src/Makefile.in +++ b/mozilla/layout/xul/base/src/tree/src/Makefile.in @@ -49,7 +49,6 @@ REQUIRES = xpcom \ string \ dom \ content \ - xul \ gfx \ thebes \ widget \ diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index 25b01c3a902..785ab242bbe 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -58,7 +58,6 @@ REQUIRES = xpcom \ layout \ widget \ mork \ - docshell \ pref \ necko \ locale \ diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in index bae5157ba83..de6470c3142 100644 --- a/mozilla/mailnews/base/util/Makefile.in +++ b/mozilla/mailnews/base/util/Makefile.in @@ -75,7 +75,6 @@ REQUIRES = xpcom \ addrbook \ docshell \ uriloader \ - appshell \ msgimap \ msglocal \ msgnews \ @@ -85,7 +84,6 @@ REQUIRES = xpcom \ nkcache \ mimetype \ windowwatcher \ - embed_base \ htmlparser \ content \ layout \ diff --git a/mozilla/mailnews/build/Makefile.in b/mozilla/mailnews/build/Makefile.in index a454f3bf366..1c47a7d00a6 100644 --- a/mozilla/mailnews/build/Makefile.in +++ b/mozilla/mailnews/build/Makefile.in @@ -62,13 +62,9 @@ MOZILLA_INTERNAL_API = 1 MODULE_NAME = nsMailModule REQUIRES = xpcom \ - alerts \ addrbook \ appcomps \ - appshell \ toolkitcomps \ - bayesflt \ - xmlextras \ content \ dom \ docshell \ @@ -82,14 +78,11 @@ REQUIRES = xpcom \ mailview \ msglocal \ msgcompose \ - msgbaseutil \ msgbase \ msgnews \ msgimap \ msgdb \ - msgmdn \ mime \ - mimeemitter \ mork \ necko \ nkcache \ diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in index 05464010173..1c126b8947e 100644 --- a/mozilla/mailnews/compose/src/Makefile.in +++ b/mozilla/mailnews/compose/src/Makefile.in @@ -51,7 +51,6 @@ REQUIRES = xpcom \ string \ dom \ layout \ - js \ editor \ uriloader \ msgbase \ @@ -82,12 +81,12 @@ REQUIRES = xpcom \ nkcache \ mimetype \ windowwatcher \ - xulapp \ + gfx \ $(NULL) -#ifdef XP_WIN32 - REQUIRES += gfx -#endif +ifdef MOZ_THUNDERBIRD +REQUIRES += xulapp +endif DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_VERSION)" diff --git a/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in b/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in index d9636a30259..5857c6e2731 100644 --- a/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in +++ b/mozilla/mailnews/extensions/bayesian-spam-filter/src/Makefile.in @@ -54,7 +54,6 @@ REQUIRES = xpcom \ necko \ mailnews \ msgbaseutil \ - msgdb \ lwbrk \ mimetype \ mime \ diff --git a/mozilla/mailnews/extensions/mailviews/src/Makefile.in b/mozilla/mailnews/extensions/mailviews/src/Makefile.in index 7208a2d1b04..79c27aa520c 100644 --- a/mozilla/mailnews/extensions/mailviews/src/Makefile.in +++ b/mozilla/mailnews/extensions/mailviews/src/Makefile.in @@ -52,8 +52,6 @@ REQUIRES = xpcom \ msgbase \ mailnews \ necko \ - msgbaseutil \ - msgdb \ mime \ intl \ $(NULL) diff --git a/mozilla/mailnews/extensions/mdn/src/Makefile.in b/mozilla/mailnews/extensions/mdn/src/Makefile.in index a315f3d6860..108ab1f1000 100644 --- a/mozilla/mailnews/extensions/mdn/src/Makefile.in +++ b/mozilla/mailnews/extensions/mdn/src/Makefile.in @@ -56,7 +56,6 @@ REQUIRES = xpcom \ pref \ intl \ msgbaseutil \ - msgdb \ msgimap \ mimetype \ msgcompose \ diff --git a/mozilla/mailnews/extensions/smime/build/Makefile.in b/mozilla/mailnews/extensions/smime/build/Makefile.in index 21c41f2e87e..db10832c5bf 100644 --- a/mozilla/mailnews/extensions/smime/build/Makefile.in +++ b/mozilla/mailnews/extensions/smime/build/Makefile.in @@ -60,7 +60,6 @@ REQUIRES = xpcom \ pipnss \ necko \ intl \ - caps \ $(NULL) ifndef MOZ_STATIC_MAIL_BUILD diff --git a/mozilla/mailnews/extensions/smime/src/Makefile.in b/mozilla/mailnews/extensions/smime/src/Makefile.in index c658b285d27..c64833a18f8 100644 --- a/mozilla/mailnews/extensions/smime/src/Makefile.in +++ b/mozilla/mailnews/extensions/smime/src/Makefile.in @@ -56,7 +56,6 @@ REQUIRES = xpcom \ msgcompose \ necko \ intl \ - caps \ $(NULL) CPPSRCS = \ diff --git a/mozilla/mailnews/import/build/Makefile.in b/mozilla/mailnews/import/build/Makefile.in index caac1a44a60..aa41700526d 100644 --- a/mozilla/mailnews/import/build/Makefile.in +++ b/mozilla/mailnews/import/build/Makefile.in @@ -53,19 +53,9 @@ MODULE_NAME = nsImportServiceModule REQUIRES = xpcom \ string \ - mailnews \ - addrbook \ uconv \ - mork \ - msgbase \ - msgbaseutil \ intl \ - impText \ impComm4xMail \ - necko \ - rdf \ - msgdb \ - unicharutil \ $(NULL) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) diff --git a/mozilla/mailnews/import/eudora/src/Makefile.in b/mozilla/mailnews/import/eudora/src/Makefile.in index eb87978e1cf..7b6dcb30a05 100644 --- a/mozilla/mailnews/import/eudora/src/Makefile.in +++ b/mozilla/mailnews/import/eudora/src/Makefile.in @@ -58,11 +58,8 @@ REQUIRES = xpcom \ msgcompose \ msgbase \ dom \ - content \ editor \ - uriloader \ mailnews \ - msgdb \ msgbaseutil \ msglocal \ mime \ diff --git a/mozilla/mailnews/import/src/Makefile.in b/mozilla/mailnews/import/src/Makefile.in index e0bb234bf2d..3f509fc8cca 100644 --- a/mozilla/mailnews/import/src/Makefile.in +++ b/mozilla/mailnews/import/src/Makefile.in @@ -54,11 +54,9 @@ REQUIRES = xpcom \ addrbook \ uconv \ msgbase \ - msgbaseutil \ intl \ necko \ rdf \ - msgdb \ unicharutil \ $(NULL) diff --git a/mozilla/mailnews/import/text/src/Makefile.in b/mozilla/mailnews/import/text/src/Makefile.in index 4f46019eeca..8d76c4d49b2 100644 --- a/mozilla/mailnews/import/text/src/Makefile.in +++ b/mozilla/mailnews/import/text/src/Makefile.in @@ -57,7 +57,6 @@ REQUIRES = xpcom \ necko \ addrbook \ pref \ - mork \ msgbase \ msgbaseutil \ $(NULL) diff --git a/mozilla/mailnews/local/src/Makefile.in b/mozilla/mailnews/local/src/Makefile.in index 0def7554764..0e6735817ff 100644 --- a/mozilla/mailnews/local/src/Makefile.in +++ b/mozilla/mailnews/local/src/Makefile.in @@ -64,7 +64,6 @@ REQUIRES = xpcom \ txmgr \ caps \ docshell \ - uriloader \ msgimap \ msgcompose \ nkcache \ diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index ea38cc20974..860502816fc 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -73,7 +73,6 @@ REQUIRES = xpcom \ chardet \ caps \ mimetype \ - uriloader \ xpconnect \ nkcache \ pipnss \ diff --git a/mozilla/mailnews/news/src/Makefile.in b/mozilla/mailnews/news/src/Makefile.in index 9db57a10022..2f87c6dc906 100644 --- a/mozilla/mailnews/news/src/Makefile.in +++ b/mozilla/mailnews/news/src/Makefile.in @@ -63,7 +63,6 @@ REQUIRES = xpcom \ pref \ uriloader \ appshell \ - appcomps \ toolkitcomps \ mime \ intl \ diff --git a/mozilla/modules/libpr0n/build/Makefile.in b/mozilla/modules/libpr0n/build/Makefile.in index 1d9eede89ac..55864b11962 100644 --- a/mozilla/modules/libpr0n/build/Makefile.in +++ b/mozilla/modules/libpr0n/build/Makefile.in @@ -59,8 +59,6 @@ REQUIRES = xpcom \ nkcache \ gfx \ caps \ - xpconnect \ - js \ $(JPEG_REQUIRES) \ $(PNG_REQUIRES) \ $(ZLIB_REQUIRES) \ diff --git a/mozilla/modules/libpr0n/decoders/gif/Makefile.in b/mozilla/modules/libpr0n/decoders/gif/Makefile.in index c4452e533f7..a7aadc9b019 100644 --- a/mozilla/modules/libpr0n/decoders/gif/Makefile.in +++ b/mozilla/modules/libpr0n/decoders/gif/Makefile.in @@ -52,7 +52,6 @@ REQUIRES = xpcom \ string \ gfx \ thebes \ - cairo \ imglib2 \ $(LCMS_REQUIRES) \ $(NULL) diff --git a/mozilla/modules/libpr0n/encoders/jpeg/Makefile.in b/mozilla/modules/libpr0n/encoders/jpeg/Makefile.in index f50d7ee2534..3c1a3a2d80b 100644 --- a/mozilla/modules/libpr0n/encoders/jpeg/Makefile.in +++ b/mozilla/modules/libpr0n/encoders/jpeg/Makefile.in @@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx REQUIRES = xpcom \ - gfx \ string \ imglib2 \ $(JPEG_REQUIRES) \ diff --git a/mozilla/modules/libpr0n/encoders/png/Makefile.in b/mozilla/modules/libpr0n/encoders/png/Makefile.in index a12bed2e850..6a1ef0df441 100644 --- a/mozilla/modules/libpr0n/encoders/png/Makefile.in +++ b/mozilla/modules/libpr0n/encoders/png/Makefile.in @@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx REQUIRES = xpcom \ - gfx \ string \ imglib2 \ $(PNG_REQUIRES) \ diff --git a/mozilla/modules/libpr0n/src/Makefile.in b/mozilla/modules/libpr0n/src/Makefile.in index 44cc97754db..6db5245b12c 100644 --- a/mozilla/modules/libpr0n/src/Makefile.in +++ b/mozilla/modules/libpr0n/src/Makefile.in @@ -55,7 +55,6 @@ REQUIRES = xpcom \ nkcache \ gfx \ thebes \ - cairo \ caps \ xpconnect \ js \ diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index cd8a794793d..0fbb47004b1 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -54,7 +54,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ - xpcom_obsolete \ string \ intl \ necko \ @@ -66,6 +65,10 @@ REQUIRES += ipcd \ $(NULL) endif +ifndef MOZ_NO_XPCOM_OBSOLETE +REQUIRES += xpcom_obsolete +endif + include $(topsrcdir)/config/config.mk CPPSRCS = nsPref.cpp \ diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in index 0a492326596..2ba0547d483 100644 --- a/mozilla/netwerk/protocol/file/src/Makefile.in +++ b/mozilla/netwerk/protocol/file/src/Makefile.in @@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ mimetype \ - pref \ uconv \ $(NULL) diff --git a/mozilla/netwerk/protocol/gopher/src/Makefile.in b/mozilla/netwerk/protocol/gopher/src/Makefile.in index 98da45b5efa..b76505744ef 100644 --- a/mozilla/netwerk/protocol/gopher/src/Makefile.in +++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in @@ -48,10 +48,8 @@ LIBRARY_NAME = nkgopher_s LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ - necko \ string \ mimetype \ - pref \ intl \ uconv \ $(NULL) diff --git a/mozilla/netwerk/protocol/viewsource/src/Makefile.in b/mozilla/netwerk/protocol/viewsource/src/Makefile.in index 39b80eb0b94..56823b5d673 100644 --- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in +++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in @@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ string \ - necko \ mimetype \ $(NULL) diff --git a/mozilla/storage/build/Makefile.in b/mozilla/storage/build/Makefile.in index 23853e6bd8e..9a6d9e02982 100644 --- a/mozilla/storage/build/Makefile.in +++ b/mozilla/storage/build/Makefile.in @@ -53,13 +53,11 @@ MODULE_NAME = mozStorageModule LIBXUL_LIBRARY = 1 REQUIRES = \ - storage \ sqlite3 \ xpcom \ string \ js \ xpconnect \ - intl \ $(NULL) EXPORTS = mozStorageCID.h diff --git a/mozilla/storage/src/Makefile.in b/mozilla/storage/src/Makefile.in index 5697eb5667c..b3daebb41e1 100644 --- a/mozilla/storage/src/Makefile.in +++ b/mozilla/storage/src/Makefile.in @@ -51,8 +51,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ - intl \ - necko \ string \ sqlite3 \ js \ diff --git a/mozilla/storage/test/Makefile.in b/mozilla/storage/test/Makefile.in index fa40cfec1b5..71c407c6d52 100644 --- a/mozilla/storage/test/Makefile.in +++ b/mozilla/storage/test/Makefile.in @@ -56,7 +56,6 @@ REQUIRES = \ xpcom \ string \ storage \ - storagecomps \ $(NULL) LIBS = \ diff --git a/mozilla/suite/app/Makefile.in b/mozilla/suite/app/Makefile.in index df2bbc3c60f..29f33eb7241 100644 --- a/mozilla/suite/app/Makefile.in +++ b/mozilla/suite/app/Makefile.in @@ -63,7 +63,6 @@ endif REQUIRES = \ xpcom \ string \ - xulapp \ $(NULL) CPPSRCS = nsSuiteApp.cpp diff --git a/mozilla/suite/browser/src/Makefile.in b/mozilla/suite/browser/src/Makefile.in index da33cf2dc13..914413b0e08 100644 --- a/mozilla/suite/browser/src/Makefile.in +++ b/mozilla/suite/browser/src/Makefile.in @@ -48,14 +48,10 @@ META_COMPONENT = suite REQUIRES = \ chardet \ - content \ docshell \ dom \ - js \ widget \ - gfx \ intl \ - layout \ locale \ necko \ nkcache \ diff --git a/mozilla/suite/build/Makefile.in b/mozilla/suite/build/Makefile.in index 0f057980110..083c8219059 100644 --- a/mozilla/suite/build/Makefile.in +++ b/mozilla/suite/build/Makefile.in @@ -50,19 +50,14 @@ MODULE_NAME = nsSuiteModule REQUIRES = \ chardet \ - dom \ intl \ - libreg \ necko \ nkcache \ - pref \ rdf \ string \ suitebrowser \ suitemigration \ txmgr \ - unicharutil \ - windowwatcher \ xpcom \ xulapp \ $(NULL) diff --git a/mozilla/suite/profile/migration/src/Makefile.in b/mozilla/suite/profile/migration/src/Makefile.in index a12db3c1194..7994296ac9a 100644 --- a/mozilla/suite/profile/migration/src/Makefile.in +++ b/mozilla/suite/profile/migration/src/Makefile.in @@ -54,12 +54,9 @@ REQUIRES = \ libreg \ pref \ rdf \ - unicharutil \ windowwatcher \ suitebrowser \ - suiteprofile \ xulapp \ - profile \ $(NULL) CPPSRCS = \ diff --git a/mozilla/toolkit/components/alerts/src/mac/Makefile.in b/mozilla/toolkit/components/alerts/src/mac/Makefile.in index a59ef2c9b17..0b541717156 100644 --- a/mozilla/toolkit/components/alerts/src/mac/Makefile.in +++ b/mozilla/toolkit/components/alerts/src/mac/Makefile.in @@ -50,7 +50,6 @@ REQUIRES = \ xpcom \ string \ necko \ - xulapp \ intl \ $(NULL) diff --git a/mozilla/toolkit/components/build/Makefile.in b/mozilla/toolkit/components/build/Makefile.in index 470c81e05b8..4a4b6ff386f 100644 --- a/mozilla/toolkit/components/build/Makefile.in +++ b/mozilla/toolkit/components/build/Makefile.in @@ -61,21 +61,15 @@ REQUIRES = \ widget \ layout \ dom \ - pref \ - rdf \ intl \ docshell \ - autocomplete \ appcomps \ downloads \ fastfind \ mimetype \ webbrowserpersist \ - progressDlg \ necko \ - windowwatcher \ uriloader \ - xpinstall \ xulapp \ embed_base \ content \ @@ -85,12 +79,14 @@ REQUIRES = \ locale \ unicharutil \ xuldoc \ - alerts \ - url-classifier \ feeds \ storage \ $(NULL) +ifdef ALERTS_SERVICE +REQUIRES += alerts +endif + EXPORTS = nsToolkitCompsCID.h CPPSRCS = nsToolkitCompsModule.cpp @@ -131,6 +127,7 @@ endif ifdef MOZ_URL_CLASSIFIER SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX) EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) +REQUIRES += url-classifier endif ifdef MOZ_FEEDS diff --git a/mozilla/toolkit/components/downloads/src/Makefile.in b/mozilla/toolkit/components/downloads/src/Makefile.in index 1e652274df5..3b35728db8a 100644 --- a/mozilla/toolkit/components/downloads/src/Makefile.in +++ b/mozilla/toolkit/components/downloads/src/Makefile.in @@ -56,7 +56,6 @@ REQUIRES = xpcom \ mimetype \ necko \ pref \ - progressDlg \ intl \ windowwatcher \ webbrowserpersist \ @@ -65,7 +64,6 @@ REQUIRES = xpcom \ embed_base \ alerts \ storage \ - xulapp \ exthandler \ docshell \ $(NULL) @@ -77,6 +75,7 @@ CPPSRCS = \ ifndef GNU_CXX ifeq ($(OS_ARCH),WINNT) CPPSRCS += nsDownloadScanner.cpp +REQUIRES += xulapp endif endif diff --git a/mozilla/toolkit/components/feeds/src/Makefile.in b/mozilla/toolkit/components/feeds/src/Makefile.in index 978b5976645..f33379f0a49 100644 --- a/mozilla/toolkit/components/feeds/src/Makefile.in +++ b/mozilla/toolkit/components/feeds/src/Makefile.in @@ -53,7 +53,6 @@ REQUIRES = \ necko \ string \ widget \ - js \ dom \ htmlparser \ content \ diff --git a/mozilla/toolkit/components/places/src/Makefile.in b/mozilla/toolkit/components/places/src/Makefile.in index 39bc84b00fd..2dda865e518 100644 --- a/mozilla/toolkit/components/places/src/Makefile.in +++ b/mozilla/toolkit/components/places/src/Makefile.in @@ -52,9 +52,7 @@ IS_COMPONENT = 1 REQUIRES = xpcom \ string \ - history \ docshell \ - rdf \ dom \ morkreader \ pref \ @@ -67,17 +65,9 @@ REQUIRES = xpcom \ unicharutil \ autocomplete \ storage \ - uconv \ - htmlparser \ - content \ txmgr \ - caps \ - xpconnect \ - js \ nkcache \ widget \ - url-classifier \ - microsummaries \ $(NULL) CPPSRCS = \ diff --git a/mozilla/toolkit/components/satchel/src/Makefile.in b/mozilla/toolkit/components/satchel/src/Makefile.in index e8126d24c77..ed7c6a1212e 100644 --- a/mozilla/toolkit/components/satchel/src/Makefile.in +++ b/mozilla/toolkit/components/satchel/src/Makefile.in @@ -54,7 +54,6 @@ REQUIRES = \ xpcom \ string \ autocomplete \ - uriloader \ dom \ layout \ docshell \ @@ -63,13 +62,9 @@ REQUIRES = \ necko \ widget \ content \ - view \ locale \ unicharutil \ - intl \ pref \ - windowwatcher \ - toolkitcomps \ loginmgr \ $(NULL) diff --git a/mozilla/toolkit/crashreporter/Makefile.in b/mozilla/toolkit/crashreporter/Makefile.in index cdce4622511..0483ecad072 100644 --- a/mozilla/toolkit/crashreporter/Makefile.in +++ b/mozilla/toolkit/crashreporter/Makefile.in @@ -48,7 +48,6 @@ LIBRARY_NAME = exception_handler_s REQUIRES = \ xpcom \ string \ - xulapp \ $(NULL) DIRS = \ diff --git a/mozilla/toolkit/crashreporter/client/Makefile.in b/mozilla/toolkit/crashreporter/client/Makefile.in index 27b559d3441..eaa4f14057f 100644 --- a/mozilla/toolkit/crashreporter/client/Makefile.in +++ b/mozilla/toolkit/crashreporter/client/Makefile.in @@ -46,7 +46,8 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = crashreporter$(BIN_SUFFIX) DIST_PROGRAM = crashreporter$(BIN_SUFFIX) -REQUIRES = sender +REQUIRES = \ + $(NULL) LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src diff --git a/mozilla/toolkit/mozapps/update/src/updater/Makefile.in b/mozilla/toolkit/mozapps/update/src/updater/Makefile.in index 1df1ee74fbe..d020d6f4fe4 100644 --- a/mozilla/toolkit/mozapps/update/src/updater/Makefile.in +++ b/mozilla/toolkit/mozapps/update/src/updater/Makefile.in @@ -52,7 +52,10 @@ CPPSRCS = \ PROGRAM = updater$(BIN_SUFFIX) -REQUIRES = libmar libbz2 string +REQUIRES = \ + libmar \ + libbz2 \ + $(NULL) LIBS += \ $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ @@ -125,4 +128,5 @@ endif ifeq ($(OS_ARCH),WINNT) # Pick up nsWindowsRestart.cpp LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre +REQUIRES += string endif diff --git a/mozilla/toolkit/xre/Makefile.in b/mozilla/toolkit/xre/Makefile.in index 507279d3a1c..0c050c77bb3 100644 --- a/mozilla/toolkit/xre/Makefile.in +++ b/mozilla/toolkit/xre/Makefile.in @@ -51,12 +51,10 @@ REQUIRES = \ appcomps \ toolkitcomps \ appshell \ - appstartup \ chrome \ content \ docshell \ dom \ - layout \ embed_base \ embedcomponents \ extensions \ @@ -68,13 +66,11 @@ REQUIRES = \ profile \ string \ uriloader \ - layout \ widget \ windowwatcher \ xpcom \ xpconnect \ xpinstall \ - xremoteservice \ $(NULL) ifdef MOZ_JPROF diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in index 39d123134db..3094af08155 100644 --- a/mozilla/widget/src/cocoa/Makefile.in +++ b/mozilla/widget/src/cocoa/Makefile.in @@ -60,7 +60,6 @@ REQUIRES = xpcom \ content \ layout \ view \ - xul \ necko \ locale \ pref \ @@ -68,7 +67,6 @@ REQUIRES = xpcom \ exthandler \ appshell \ thebes \ - cairo \ js \ xpconnect \ imglib2 \ diff --git a/mozilla/widget/src/support/Makefile.in b/mozilla/widget/src/support/Makefile.in index 2bb0ca53f08..4fed9b904d5 100644 --- a/mozilla/widget/src/support/Makefile.in +++ b/mozilla/widget/src/support/Makefile.in @@ -46,7 +46,6 @@ MODULE = widget LIBRARY_NAME = widgetsupport_s LIBXUL_LIBRARY = 1 REQUIRES = xpcom \ - string \ gfx \ $(NULL) diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index aa2ce356118..1c7ee159dca 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -63,7 +63,6 @@ REQUIRES = xpcom \ windowwatcher \ lcms \ thebes \ - cairo \ $(NULL) DEFINES += -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT diff --git a/mozilla/xpfe/bootstrap/appleevents/Makefile.in b/mozilla/xpfe/bootstrap/appleevents/Makefile.in index def973dfd59..815bb50b3b4 100644 --- a/mozilla/xpfe/bootstrap/appleevents/Makefile.in +++ b/mozilla/xpfe/bootstrap/appleevents/Makefile.in @@ -52,7 +52,6 @@ REQUIRES = xpcom \ gfx \ widget \ necko \ - pref \ docshell \ appshell \ appcomps \ diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in index a300d1f8c47..01ead8e0d33 100644 --- a/mozilla/xpfe/browser/src/Makefile.in +++ b/mozilla/xpfe/browser/src/Makefile.in @@ -54,12 +54,9 @@ REQUIRES = xpcom \ widget \ gfx \ docshell \ - appshell \ appcomps \ dom \ content \ - layout \ - js \ uriloader \ pref \ webbrwsr \ diff --git a/mozilla/xpfe/components/autocomplete/src/Makefile.in b/mozilla/xpfe/components/autocomplete/src/Makefile.in index f72a19645e9..1e9bb0cd115 100644 --- a/mozilla/xpfe/components/autocomplete/src/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/src/Makefile.in @@ -53,7 +53,6 @@ IS_COMPONENT = 1 REQUIRES = xpcom \ string \ dom \ - intl \ $(NULL) CPPSRCS = nsAutoComplete.cpp diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index 9355996c14b..af0cb3f3609 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/xpfe/components/build/Makefile.in @@ -54,28 +54,12 @@ PACKAGE_VARS += MOZ_PHOENIX REQUIRES = xpcom \ string \ - content \ rdf \ necko \ - nkcache \ - intl \ - locale \ - mork \ - widget \ - dom \ uriloader \ - mimetype \ - embed_base \ - webbrowserpersist \ - progressDlg \ - pref \ docshell \ webshell \ - appshell \ browser \ - txmgr \ - chardet \ - autocomplete \ $(NULL) CPPSRCS = nsModule.cpp @@ -96,7 +80,14 @@ endif # Suite specific includes ifdef MOZ_SUITE -REQUIRES += downloadmanager +REQUIRES += \ + downloadmanager \ + intl \ + mork \ + widget \ + mimetype \ + autocomplete \ + $(NULL) SHARED_LIBRARY_LIBS += \ ../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \ diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index 9eb1ba8506b..a12fdadfd50 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/xpfe/components/directory/Makefile.in @@ -62,7 +62,6 @@ REQUIRES = xpcom \ webshell \ uconv \ pref \ - uriloader \ windowwatcher \ $(NULL) diff --git a/mozilla/xpfe/components/download-manager/src/Makefile.in b/mozilla/xpfe/components/download-manager/src/Makefile.in index fdd734b1ada..efe637326ab 100644 --- a/mozilla/xpfe/components/download-manager/src/Makefile.in +++ b/mozilla/xpfe/components/download-manager/src/Makefile.in @@ -54,7 +54,6 @@ REQUIRES = xpcom \ uriloader \ mimetype \ necko \ - progressDlg \ intl \ windowwatcher \ webbrowserpersist \ @@ -63,7 +62,6 @@ REQUIRES = xpcom \ profile \ widget \ pref \ - appcomps \ embed_base \ $(NULL) diff --git a/mozilla/xpfe/components/intl/Makefile.in b/mozilla/xpfe/components/intl/Makefile.in index 22a0bb8acec..270204b8bc5 100644 --- a/mozilla/xpfe/components/intl/Makefile.in +++ b/mozilla/xpfe/components/intl/Makefile.in @@ -52,15 +52,10 @@ IS_COMPONENT = 1 REQUIRES = xpcom \ string \ uconv \ - unicharutil \ locale \ - intl \ rdf \ pref \ necko \ - dom \ - windowwatcher \ - appshell \ $(NULL) CPPSRCS= \