From 0c89f24d608d027dd0686e0c7419d86145f80552 Mon Sep 17 00:00:00 2001 From: "disttsc%bart.nl" Date: Sun, 8 Apr 2001 08:33:11 +0000 Subject: [PATCH] Clean up MODULE/REQUIRES, bug=73353, r=cls git-svn-id: svn://10.0.0.236/trunk@91684 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/src/Makefile.in | 2 +- mozilla/dom/src/base/Makefile.in | 2 +- mozilla/editor/base/Makefile.in | 2 +- mozilla/embedding/browser/gtk/src/Makefile.in | 3 ++- mozilla/embedding/browser/gtk/tests/Makefile.in | 1 + mozilla/extensions/cookie/Makefile.in | 2 +- mozilla/extensions/cookie/tests/Makefile.in | 2 +- mozilla/extensions/xmlextras/build/src/Makefile.in | 2 +- mozilla/gfx/src/gtk/Makefile.in | 2 +- mozilla/mailnews/absync/src/Makefile.in | 2 +- mozilla/mailnews/addrbook/build/Makefile.in | 2 +- mozilla/mailnews/addrbook/src/Makefile.in | 2 +- mozilla/mailnews/base/build/Makefile.in | 2 +- mozilla/mailnews/base/src/Makefile.in | 2 +- mozilla/mailnews/imap/src/Makefile.in | 2 +- mozilla/modules/libimg/src/Makefile.in | 2 +- mozilla/modules/mpfilelocprovider/public/Makefile.in | 1 + mozilla/modules/plugin/base/src/Makefile.in | 2 +- mozilla/modules/plugin/nglsrc/Makefile.in | 2 +- mozilla/modules/plugin/samples/simple/Makefile.in | 2 +- mozilla/modules/plugin/test/Makefile.in | 2 +- mozilla/netwerk/test/Makefile.in | 2 +- mozilla/profile/pref-migrator/src/Makefile.in | 2 +- mozilla/uriloader/base/Makefile.in | 2 +- mozilla/uriloader/exthandler/Makefile.in | 2 +- mozilla/webshell/tests/viewer/Makefile.in | 1 + mozilla/webshell/tests/viewer/public/Makefile.in | 2 ++ mozilla/webshell/tests/viewer/unix/gtk/Makefile.in | 1 + mozilla/widget/src/gtksuperwin/Makefile.in | 1 + mozilla/xpfe/appshell/src/Makefile.in | 2 +- mozilla/xpfe/bootstrap/Makefile.in | 2 +- mozilla/xpfe/browser/public/Makefile.in | 1 + mozilla/xpfe/browser/src/Makefile.in | 4 ++-- mozilla/xpfe/components/autocomplete/public/Makefile.in | 1 + mozilla/xpfe/components/autocomplete/src/Makefile.in | 2 +- mozilla/xpfe/components/find/src/Makefile.in | 2 +- mozilla/xpfe/components/public/Makefile.in | 1 + mozilla/xpfe/components/ucth/public/Makefile.in | 1 + mozilla/xpfe/components/ucth/src/Makefile.in | 2 +- mozilla/xpfe/components/xfer/public/Makefile.in | 1 + mozilla/xpfe/components/xfer/src/Makefile.in | 2 +- mozilla/xpinstall/src/Makefile.in | 2 +- 42 files changed, 45 insertions(+), 32 deletions(-) diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index aae2cd93ba3..950cef0e214 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = caps LIBRARY_NAME = caps IS_COMPONENT = 1 -REQUIRES = xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout appshell docshell uriloader gfx2 windowwatcher +REQUIRES = xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout docshell uriloader gfx2 windowwatcher CPPSRCS = \ nsBasePrincipal.cpp \ diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 0405baa5d98..3aff71bdb8c 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdombase_s -REQUIRES = xpcom string webbrwsr js widget layout caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer cookie webshell view uconv shistory plugin windowwatcher gfx2 +REQUIRES = xpcom string webbrwsr js widget layout caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin windowwatcher gfx2 CPPSRCS = \ nsBarProps.cpp \ diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in index 2bc930c4f37..62f654eadc2 100644 --- a/mozilla/editor/base/Makefile.in +++ b/mozilla/editor/base/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = editor LIBRARY_NAME = editor IS_COMPONENT = 1 -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc gfx2 +REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc gfx2 mozcomps CPPSRCS = \ ChangeAttributeTxn.cpp \ diff --git a/mozilla/embedding/browser/gtk/src/Makefile.in b/mozilla/embedding/browser/gtk/src/Makefile.in index fa74407e6ca..9920dca967b 100644 --- a/mozilla/embedding/browser/gtk/src/Makefile.in +++ b/mozilla/embedding/browser/gtk/src/Makefile.in @@ -25,8 +25,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = gtkembedmoz LIBRARY_NAME = gtkembedmoz -REQUIRES = xpcom string docshell webshell necko widget dom layout locale js uriloader webbrwsr shistory embed_base pref windowwatcher gfx2 +REQUIRES = xpcom string docshell webshell necko widget dom layout locale js uriloader webbrwsr shistory embed_base pref windowwatcher gfx2 mpfilelocprovider CPPSRCS = \ gtkmozembed2.cpp \ diff --git a/mozilla/embedding/browser/gtk/tests/Makefile.in b/mozilla/embedding/browser/gtk/tests/Makefile.in index 1e72767bc00..a640ff768ae 100644 --- a/mozilla/embedding/browser/gtk/tests/Makefile.in +++ b/mozilla/embedding/browser/gtk/tests/Makefile.in @@ -25,6 +25,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = gtkembedmoz REQUIRES = xpcom string dom CPPSRCS = \ diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index 4dfda49548a..c4f121342d5 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = cookie LIBRARY_NAME = cookie IS_COMPONENT = 1 -REQUIRES = xpcom string necko dom js widget layout appshell pref intl locale uriloader windowwatcher +REQUIRES = xpcom string necko dom js widget layout pref intl locale uriloader windowwatcher ifdef ENABLE_TESTS DIRS = tests diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in index 366fab3c9f1..cec58e05225 100644 --- a/mozilla/extensions/cookie/tests/Makefile.in +++ b/mozilla/extensions/cookie/tests/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string cookie necko intl locale layout widget dom +REQUIRES = xpcom string cookie necko intl locale PROGRAM = TestCookie$(BIN_SUFFIX) CPPSRCS = TestCookie.cpp diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in index f290bee07e6..6f58f81e717 100644 --- a/mozilla/extensions/xmlextras/build/src/Makefile.in +++ b/mozilla/extensions/xmlextras/build/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = xmlextras LIBRARY_NAME = xmlextras SHORT_LIBNAME = xmlextra IS_COMPONENT = 1 -REQUIRES = xpcom string dom js layout widget caps necko webbrwsr appstartupnotifier embedcomponents +REQUIRES = xpcom string dom js layout widget caps necko webbrwsr embedcomponents CPPSRCS = nsXMLExtrasModule.cpp diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index 3d568814cc9..fd763c5d07a 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/gfx/src/gtk/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gfx_gtk IS_COMPONENT = 1 -REQUIRES = xpcom string img widget view util dom pref js uconv appshell necko unicharutil gfx2 +REQUIRES = xpcom string img widget view util dom pref js uconv appshell necko unicharutil gfx2 mozcomps CSRCS = nsPrintdGTK.c diff --git a/mozilla/mailnews/absync/src/Makefile.in b/mozilla/mailnews/absync/src/Makefile.in index b16fb8d13f8..d139e05d31d 100644 --- a/mozilla/mailnews/absync/src/Makefile.in +++ b/mozilla/mailnews/absync/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = absyncsvc XPIDL_MODULE = absync LIBRARY_NAME = absync_s -REQUIRES = xpcom string necko mime cookie docshell locale uriloader pref layout widget msgbase msgbaseutil dom rdf addrbook intl locale appshell mork mimetype gfx2 windowwatcher +REQUIRES = xpcom string necko mime cookie docshell locale uriloader pref layout widget msgbase msgbaseutil dom rdf addrbook intl locale mork mimetype gfx2 windowwatcher CPPSRCS = \ nsAbSyncPostEngine.cpp \ diff --git a/mozilla/mailnews/addrbook/build/Makefile.in b/mozilla/mailnews/addrbook/build/Makefile.in index ab16a613d21..7ff3fbe835a 100644 --- a/mozilla/mailnews/addrbook/build/Makefile.in +++ b/mozilla/mailnews/addrbook/build/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = addrbook LIBRARY_NAME = addrbook IS_COMPONENT = 1 -REQUIRES = xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget uriloader layout locale mork xuldoc gfx2 +REQUIRES = xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget uriloader layout locale mork xuldoc gfx2 appcomps CPPSRCS = nsAbFactory.cpp EXPORTS = nsAbBaseCID.h diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index 9589c732f30..8eb2ff9e8dc 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = addrbook LIBRARY_NAME = addrbook_s -REQUIRES = xpcom string rdf rdfutil appshell dom js layout widget mork docshell pref necko locale uriloader webshell uconv msgbase msgbaseutil mime msgcompose xuldoc gfx2 +REQUIRES = xpcom string rdf rdfutil appshell dom js layout widget mork docshell pref necko locale uriloader webshell uconv msgbase msgbaseutil mime msgcompose xuldoc gfx2 appcomps CPPSRCS = \ nsAddressBook.cpp \ diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in index a9fa74b2b1c..65442652caa 100644 --- a/mozilla/mailnews/base/build/Makefile.in +++ b/mozilla/mailnews/base/build/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgbase LIBRARY_NAME = mailnews IS_COMPONENT = 1 -REQUIRES = xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 +REQUIRES = xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 mozcomps ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in index 70787da022a..14a8a408a4e 100644 --- a/mozilla/mailnews/base/src/Makefile.in +++ b/mozilla/mailnews/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgbase LIBRARY_NAME = msgbase_s -REQUIRES = xpcom string necko dom js appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome xuldoc caps mime mimetype gfx2 +REQUIRES = xpcom string necko dom js appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome xuldoc caps mime mimetype gfx2 mozcomps CPPSRCS = \ nsMessenger.cpp \ diff --git a/mozilla/mailnews/imap/src/Makefile.in b/mozilla/mailnews/imap/src/Makefile.in index 6e6ee034038..c92d4143e4a 100644 --- a/mozilla/mailnews/imap/src/Makefile.in +++ b/mozilla/mailnews/imap/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgimap LIBRARY_NAME = msgimap_s -REQUIRES = xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref js intl appshell nkcache timer locale txmgr dom docshell msglocal widget layout uriloader xuldoc msgnews mimetype gfx2 windowwatcher +REQUIRES = xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref js intl nkcache timer locale txmgr dom docshell msglocal widget layout uriloader xuldoc msgnews mimetype gfx2 windowwatcher EXPORTS = \ nsIMAPBodyShell.h \ diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 926d85ca2e3..1bc90bd4a87 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = img LIBRARY_NAME = img_s -REQUIRES = xpcom string layout util locale cookie necko widget dom timer jpeg +REQUIRES = xpcom string layout util locale cookie necko timer jpeg CPPSRCS = \ ilNetReader.cpp \ diff --git a/mozilla/modules/mpfilelocprovider/public/Makefile.in b/mozilla/modules/mpfilelocprovider/public/Makefile.in index d7c33986e1f..57f44451b86 100755 --- a/mozilla/modules/mpfilelocprovider/public/Makefile.in +++ b/mozilla/modules/mpfilelocprovider/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = mpfilelocprovider EXPORTS = \ nsMPFileLocProvider.h \ $(NULL) diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 30a72de8252..ffad4bc0c5a 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = plugin XPIDL_MODULE = layout LIBRARY_NAME = gkplugin IS_COMPONENT = 1 -REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler appshell docshell webbrwsr nkcache gfx2 timer windowwatcher +REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher CPPSRCS = \ ns4xPlugin.cpp \ diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 30a72de8252..ffad4bc0c5a 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/modules/plugin/nglsrc/Makefile.in @@ -30,7 +30,7 @@ MODULE = plugin XPIDL_MODULE = layout LIBRARY_NAME = gkplugin IS_COMPONENT = 1 -REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler appshell docshell webbrwsr nkcache gfx2 timer windowwatcher +REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher CPPSRCS = \ ns4xPlugin.cpp \ diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in index 61a556ab288..254e82eef16 100644 --- a/mozilla/modules/plugin/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/samples/simple/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = npsimple LIBRARY_NAME = npsimple IS_COMPONENT = 1 -REQUIRES = xpcom string plugin +REQUIRES = xpcom string plugin widget XPIDLSRCS = nsISimplePluginInstance.idl diff --git a/mozilla/modules/plugin/test/Makefile.in b/mozilla/modules/plugin/test/Makefile.in index 61a556ab288..254e82eef16 100644 --- a/mozilla/modules/plugin/test/Makefile.in +++ b/mozilla/modules/plugin/test/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = npsimple LIBRARY_NAME = npsimple IS_COMPONENT = 1 -REQUIRES = xpcom string plugin +REQUIRES = xpcom string plugin widget XPIDLSRCS = nsISimplePluginInstance.idl diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index 668d332320c..db249940b7b 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = test_necko -REQUIRES = xpcom string necko nkcache timer cookie layout widget dom dbm +REQUIRES = xpcom string necko nkcache timer cookie dbm SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) diff --git a/mozilla/profile/pref-migrator/src/Makefile.in b/mozilla/profile/pref-migrator/src/Makefile.in index e0393a8fc22..d2bcd707d6b 100644 --- a/mozilla/profile/pref-migrator/src/Makefile.in +++ b/mozilla/profile/pref-migrator/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = prefmigr LIBRARY_NAME = nsprefm IS_COMPONENT = 1 -REQUIRES = xpcom string pref appshell intl docshell dom necko rdf js layout locale uriloader widget webbrwsr uconv gfx2 +REQUIRES = xpcom string pref appshell intl docshell dom necko rdf js layout locale uriloader widget webbrwsr uconv gfx2 mozcomps CPPSRCS = \ nsPrefMigration.cpp \ diff --git a/mozilla/uriloader/base/Makefile.in b/mozilla/uriloader/base/Makefile.in index 7966de76482..6337f787553 100644 --- a/mozilla/uriloader/base/Makefile.in +++ b/mozilla/uriloader/base/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = uriloader LIBRARY_NAME = uriloaderbase_s -REQUIRES = xpcom string necko dom exthandler pref js docshell layout widget caps htmlparser locale intl webshell +REQUIRES = xpcom string necko dom exthandler pref js docshell layout widget caps htmlparser locale intl webshell mozucth mozcomps CPPSRCS = \ nsURILoader.cpp \ diff --git a/mozilla/uriloader/exthandler/Makefile.in b/mozilla/uriloader/exthandler/Makefile.in index 19fca19ef9f..b28e9127809 100644 --- a/mozilla/uriloader/exthandler/Makefile.in +++ b/mozilla/uriloader/exthandler/Makefile.in @@ -33,7 +33,7 @@ endif MODULE = exthandler LIBRARY_NAME = exthandler_s -REQUIRES = xpcom string mimetype uriloader dom necko rdf webshell +REQUIRES = xpcom string mimetype uriloader dom necko rdf webshell mozucth ifeq ($(MOZ_WIDGET_TOOLKIT),os2) OSDIR = os2 diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index bd5971c17b0..2c4a97fa469 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk DIRS := public +MODULE = webshell_tests REQUIRES = xpcom string webshell widget layout dom webbrwsr docshell util uriloader locale necko htmlparser view timer unicharutil pref intl editor chardet cookie gfx2 PROGRAM := viewer$(BIN_SUFFIX) diff --git a/mozilla/webshell/tests/viewer/public/Makefile.in b/mozilla/webshell/tests/viewer/public/Makefile.in index 8fc3a9eb947..181157e6591 100644 --- a/mozilla/webshell/tests/viewer/public/Makefile.in +++ b/mozilla/webshell/tests/viewer/public/Makefile.in @@ -26,6 +26,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = webshell_tests + EXPORTS = \ nsIXPBaseWindow.h \ nsIWindowListener.h \ diff --git a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in index b58272ece77..355a517cb28 100644 --- a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = webshell_tests LIBRARY_NAME = viewer_gtk_s REQUIRES = xpcom string webbrwsr widget timer dom layout docshell uriloader locale webshell necko util gfx2 diff --git a/mozilla/widget/src/gtksuperwin/Makefile.in b/mozilla/widget/src/gtksuperwin/Makefile.in index 87a32be59d8..5cf30e17636 100644 --- a/mozilla/widget/src/gtksuperwin/Makefile.in +++ b/mozilla/widget/src/gtksuperwin/Makefile.in @@ -22,6 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = widget LIBRARY_NAME = gtksuperwin diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index 5655f8fef22..33192e401b7 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/xpfe/appshell/src/Makefile.in @@ -30,7 +30,7 @@ IS_COMPONENT=1 MODULE = appshell LIBRARY_NAME = nsappshell SHORT_LIBNAME = appshell -REQUIRES = xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer chardet intl wallet chrome profile prefmigr xul gfx2 windowwatcher +REQUIRES = xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer chardet intl chrome profile prefmigr xul gfx2 windowwatcher browser mozcomps EXTRA_DSO_LIBS = jsdom diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 8b742602848..8634532999c 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = apprunner -REQUIRES = xpcom string webbrwsr widget dom js necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents +REQUIRES = xpcom string webbrwsr widget dom js necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents mpfilelocprovider browser mozcomps ifeq ($(USE_SHORT_LIBNAME),1) PROGRAM = mozilla$(BIN_SUFFIX) diff --git a/mozilla/xpfe/browser/public/Makefile.in b/mozilla/xpfe/browser/public/Makefile.in index cef520ea224..32c5388a21d 100644 --- a/mozilla/xpfe/browser/public/Makefile.in +++ b/mozilla/xpfe/browser/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = browser XPIDL_MODULE = mozbrwsr XPIDLSRCS = nsIBrowserInstance.idl nsIXULBrowserWindow.idl diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in index 1efeef9fef7..1f32bb17abb 100644 --- a/mozilla/xpfe/browser/src/Makefile.in +++ b/mozilla/xpfe/browser/src/Makefile.in @@ -26,10 +26,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mozbrwsr +MODULE = browser LIBRARY_NAME = mozbrwsr IS_COMPONENT = 1 -REQUIRES = xpcom string webshell necko shistory widget layout docshell appshell dom js timer uriloader locale pref editor appcomps rdf webbrwsr uconv chardet txmgr gfx2 +REQUIRES = xpcom string webshell necko shistory widget layout docshell appshell dom js timer uriloader locale pref editor appcomps rdf webbrwsr uconv chardet txmgr gfx2 mozucth mozcomps CPPSRCS = nsBrowserInstance.cpp diff --git a/mozilla/xpfe/components/autocomplete/public/Makefile.in b/mozilla/xpfe/components/autocomplete/public/Makefile.in index 600b8ba4ad0..126128da865 100644 --- a/mozilla/xpfe/components/autocomplete/public/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = appcomps XPIDL_MODULE = autocomplete XPIDLSRCS = \ diff --git a/mozilla/xpfe/components/autocomplete/src/Makefile.in b/mozilla/xpfe/components/autocomplete/src/Makefile.in index 19708882747..bdcbdc20a3a 100644 --- a/mozilla/xpfe/components/autocomplete/src/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/src/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE=appcomps +MODULE = appcomps LIBRARY_NAME = autocomplete_s REQUIRES = xpcom string layout dom diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in index c819a38c968..e977e4d42dc 100644 --- a/mozilla/xpfe/components/find/src/Makefile.in +++ b/mozilla/xpfe/components/find/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = appcomps XPIDL_MODULE = mozfind LIBRARY_NAME = mozfind IS_COMPONENT = 1 -REQUIRES = xpcom string dom js layout widget appshell editor necko txtsvc docshell locale uriloader txmgr gfx2 +REQUIRES = xpcom string dom js layout widget appshell editor necko txtsvc docshell locale uriloader txmgr gfx2 mozcomps CPPSRCS = nsFindComponent.cpp diff --git a/mozilla/xpfe/components/public/Makefile.in b/mozilla/xpfe/components/public/Makefile.in index 86517ebb57d..cbb7bc3900f 100644 --- a/mozilla/xpfe/components/public/Makefile.in +++ b/mozilla/xpfe/components/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = mozcomps XPIDL_MODULE = mozcomps EXPORTS = nsIAppShellComponentImpl.h diff --git a/mozilla/xpfe/components/ucth/public/Makefile.in b/mozilla/xpfe/components/ucth/public/Makefile.in index f0ad1209fcb..277ce3dd4c4 100644 --- a/mozilla/xpfe/components/ucth/public/Makefile.in +++ b/mozilla/xpfe/components/ucth/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = mozucth XPIDL_MODULE = mozucth XPIDLSRCS = nsIUnkContentTypeHandler.idl \ diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in index d154140a7e6..7b4fec7fd7f 100644 --- a/mozilla/xpfe/components/ucth/src/Makefile.in +++ b/mozilla/xpfe/components/ucth/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = mozucth LIBRARY_NAME = mozucth IS_COMPONENT = 1 -REQUIRES = xpcom string appshell dom js necko widget layout intl locale exthandler pref +REQUIRES = xpcom string appshell dom js necko widget layout intl locale exthandler pref mozcomps CPPSRCS = nsUnknownContentTypeHandler.cpp diff --git a/mozilla/xpfe/components/xfer/public/Makefile.in b/mozilla/xpfe/components/xfer/public/Makefile.in index 774a395efbf..10f3732bfdc 100644 --- a/mozilla/xpfe/components/xfer/public/Makefile.in +++ b/mozilla/xpfe/components/xfer/public/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +MODULE = mozxfer XPIDL_MODULE = mozxfer XPIDLSRCS = \ diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in index 5c32b4320ca..c4e683ad3e9 100644 --- a/mozilla/xpfe/components/xfer/src/Makefile.in +++ b/mozilla/xpfe/components/xfer/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = mozxfer LIBRARY_NAME = mozxfer IS_COMPONENT = 1 -REQUIRES = xpcom string necko appshell dom js widget pref intl locale layout +REQUIRES = xpcom string necko appshell dom js widget pref intl locale layout mozcomps CPPSRCS = \ nsStreamTransfer.cpp \ diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index 6b4228546aa..2de1657b82f 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -33,7 +33,7 @@ MODULE = xpinstall LIBRARY_NAME = xpinstall SHORT_LIBNAME = xpinstal IS_COMPONENT = 1 -REQUIRES = xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom gfx2 +REQUIRES = xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom gfx2 mozcomps # XXX shouldn't need to export this EXPORTS = nsXPITriggerInfo.h