Update mailnews REQUIRES and MODULEs for bug 98371, r=cls

2001-09-12 20:30:32 +00:00 · 2001-09-12 20:30:32 +00:00 · cd3da58a2e
--- a/mailnews/absync/build/makefile.win
+++ b/mailnews/absync/build/makefile.win
@ -18,7 +18,8 @@
 # Contributor(s): 

 DEPTH=..\..\..
-MODULE=absyncsv 
+MODULE=absync
+REQUIRES	= xpcom string necko docshell uriloader msgbase intl addrbook dom mork
 LIBRARY_NAME=absyncsv
 IS_COMPONENT=1
 META_COMPONENT=mail
--- a/mailnews/absync/src/makefile.win
+++ b/mailnews/absync/src/makefile.win
@ -21,6 +21,7 @@

 DEPTH=..\..\..
 MODULE= absync
+REQUIRES	= xpcom string necko mime cookie docshell uriloader pref widget msgbase msgbaseutil dom rdf addrbook intl mork mimetype windowwatcher

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/addrbook/build/makefile.win
+++ b/mailnews/addrbook/build/makefile.win
@ -24,7 +24,7 @@ MODULE=addrbook
 LIBRARY_NAME=addrbook
 META_COMPONENT=mail
 MODULE_NAME=nsAbModule
-REQUIRES	= xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget locale mork appcomps
+REQUIRES	= xpcom string addrbook necko msgcompo mime msgbase rdf rdfutil docshell appshell dom widget locale mork appcomps raptor mozldap

 ################################################################################
 ## exports
--- a/mailnews/addrbook/src/makefile.win
+++ b/mailnews/addrbook/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= addrbook
-REQUIRES	= xpcom string rdf rdfutil appshell dom layout widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompose appcomps
+REQUIRES	= xpcom string rdf rdfutil appshell dom layout widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompo appcomps raptor gfx content mozldap

 include <$(DEPTH)\config\config.mak>

@ -31,7 +31,7 @@ include <$(DEPTH)\config\config.mak>
 EXPORTS=								\
 			nsAddressBook.h				\
 			nsAddrBookSession.h			\
- 			nsAbRDFDataSource.h			\
+			nsAbRDFDataSource.h			\
 			nsAbMDBRDFResource.h			\
 			nsCardDataSource.h			\
 			nsDirectoryDataSource.h		\
--- a/mailnews/base/build/makefile.win
+++ b/mailnews/base/build/makefile.win
@ -22,7 +22,7 @@ MODULE=msgbase
 LIBRARY_NAME=msgbase
 META_COMPONENT=mail
 MODULE_NAME=nsMsgBaseModule
-REQUIRES	= xpcom string necko intl locale timer rdf dom docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell msgnews msgimap
+REQUIRES	= xpcom string necko intl locale timer rdf dom docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompo msgbaseutil appcomps msgdb msgsearch editor appshell msgnews msgimap raptor gfx layout_xul

 ################################################################################
 ## exports
--- a/mailnews/base/search/src/makefile.win
+++ b/mailnews/base/search/src/makefile.win
@ -22,7 +22,7 @@
 DEPTH=..\..\..\..

 MODULE=msgsearch
-REQUIRES	= xpcom string mailnews msgdb msgbaseutil necko mime msgimap rdf msglocal intl pref timer msgnews txmgr
+REQUIRES	= xpcom string mailnews msgdb msgbaseutil necko mime msgimap rdf msglocal intl pref timer msgnews txmgr msgbase
 include <$(DEPTH)\config\config.mak>

 LIBRARY_NAME=msgsearch_s
@ -52,15 +52,6 @@ EXPORTS=	nsMsgFilterService.h \
 			$(NULL)


-LINCS=-I$(PUBLIC)\xpcom \
-	 -I$(PUBLIC)\mailnews \
-	 -I$(PUBLIC)\raptor \
-	 -I$(PUBLIC)\mime \
-	 -I$(PUBLIC)\locale \
-	 -I$(PUBLIC)\pref \
-	 -I$(PUBLIC)\js \
-	 -I$(PUBLIC)\netlib 
-

 LCFLAGS = \
        $(LCFLAGS) \
--- a/mailnews/base/src/makefile.win
+++ b/mailnews/base/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= msgbase
-REQUIRES	= xpcom string necko dom 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 mime mimetype windowwatcher
+REQUIRES	= xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompo msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher raptor gfx content msgsearch layout_xul

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/base/util/makefile.win
+++ b/mailnews/base/util/makefile.win
@ -20,11 +20,11 @@
 # Contributor(s): 

 DEPTH=..\..\..
-MODULE          = msgbsutl
+MODULE          = msgbaseutil
 LIBRARY_NAME    = msgbsutl
 META_COMPONENT  = mail
 EXPORT_LIBRARY  = 1
-REQUIRES	= xpcom string msgbase rdf necko msgdb intl mork mailnews locale pref rdfutil rdfutil mime msgcompose docshell webshell wallet dom uriloader appshell msgimap msglocal msgnews txmgr uconv unicharutil nkcache mimetype windowwatcher
+REQUIRES	= xpcom string msgbase rdf necko msgdb intl mork mailnews locale pref rdfutil rdfutil mime msgcompo docshell webshell wallet dom uriloader appshell msgimap msglocal msgnews txmgr uconv unicharutil nkcache mimetype windowwatcher msgsearch raptor

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/compose/build/makefile.win
+++ b/mailnews/compose/build/makefile.win
@ -22,7 +22,7 @@ MODULE          = msgcompo
 LIBRARY_NAME    = msgcompo
 META_COMPONENT  = mail
 MODULE_NAME  = nsMsgComposeModule
-REQUIRES	= xpcom string msgbase msgbaseutil editor necko dom uriloader mime addrbook rdf intl mailnews widget msgdb appshell nkcache
+REQUIRES	= xpcom string msgbase msgsearch msgbaseutil editor necko dom uriloader mime addrbook rdf intl mailnews widget msgdb appshell nkcache raptor

 ################################################################################
 ## exports
--- a/mailnews/compose/src/makefile.win
+++ b/mailnews/compose/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= msgcompo
-REQUIRES	= xpcom string dom editor uriloader msgbase mailnews necko mime pref intl locale layout msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache mimetype windowwatcher
+REQUIRES	= xpcom string dom editor uriloader msgbase msgsearch mailnews necko mime pref intl locale layout msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache mimetype windowwatcher content raptor

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/imap/build/makefile.win
+++ b/mailnews/imap/build/makefile.win
@ -24,7 +24,7 @@ MODULE          = msgimap
 LIBRARY_NAME    = msgimap
 META_COMPONENT  = mail
 MODULE_NAME  = IMAP_factory
-REQUIRES	= xpcom string mailnews msgimap msgbase msgbaseutil rdf rdfutil necko msgdb txmgr mime pref intl msglocal nkcache
+REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil rdf rdfutil necko msgdb txmgr mime pref intl msglocal nkcache

 ################################################################################
 ## exports
--- a/mailnews/imap/src/makefile.win
+++ b/mailnews/imap/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= msgimap
-REQUIRES	= xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref intl nkcache timer txmgr dom docshell msglocal msgnews mimetype windowwatcher
+REQUIRES	= xpcom string mailnews rdf msgbase msgsearch msgbaseutil rdfutil necko msgdb uconv mime pref intl nkcache timer txmgr dom docshell msglocal msgnews mimetype windowwatcher

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/import/eudora/src/makefile.win
+++ b/mailnews/import/eudora/src/makefile.win
@ -18,6 +18,7 @@
 DEPTH=..\..\..\..

 MODULE          = impEudra
+REQUIRES=xpcom string import intl necko addrbook mork msgcompo msgbase editor dom uriloader mailnews msgdb msgbaseutil msglocal mimetype
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsEudoraImportModule
--- a/mailnews/import/oexpress/makefile.win
+++ b/mailnews/import/oexpress/makefile.win
@ -24,6 +24,7 @@ DEPTH=..\..\..
 DIRS=resources

 MODULE          = importOE
+REQUIRES = xpcom string import addrbook mork intl msgbase mailnews necko msgdb msgbaseutil msgcompo msglocal
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsOEImport
@ -43,7 +44,7 @@ CPP_OBJS=\

 LLIBS=\
        $(DIST)\lib\xpcom.lib       \
- 		$(LIBNSPR)  				\
+		$(LIBNSPR)  				\
        $(NULL)

 include <$(DEPTH)\config\rules.mak>
--- a/mailnews/import/outlook/src/makefile.win
+++ b/mailnews/import/outlook/src/makefile.win
@ -22,6 +22,7 @@
 DEPTH=..\..\..\..

 MODULE          = impOutlk
+REQUIRES = xpcom string import intl necko addrbook mork msgcompo msgbase editor dom uriloader mailnews msgbaseutil msgdb msglocal mimetype
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsOutlookImport
@ -41,7 +42,7 @@ CPP_OBJS=\

 LLIBS=\
        $(DIST)\lib\xpcom.lib       \
- 		$(LIBNSPR)  				\
+		$(LIBNSPR)  				\
        $(NULL)

 include <$(DEPTH)\config\rules.mak>
--- a/mailnews/import/text/src/makefile.win
+++ b/mailnews/import/text/src/makefile.win
@ -18,6 +18,7 @@
 DEPTH=..\..\..\..

 MODULE          = impText
+REQUIRES	= xpcom string import intl necko addrbook pref mork
 LIBRARY_NAME    = $(MODULE)
 META_COMPONENT  = mail
 MODULE_NAME  = nsTextImportModule
--- a/mailnews/local/build/makefile.win
+++ b/mailnews/local/build/makefile.win
@ -24,7 +24,7 @@ MODULE          = msglocal
 LIBRARY_NAME    = msglocal
 META_COMPONENT  = mail
 MODULE_NAME  = local_mail_services
-REQUIRES	= xpcom string mailnews msgbase msgbaseutil msgdb necko txmgr rdf rdfutil mime intl pref nkcache
+REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil msgdb necko txmgr rdf rdfutil mime intl pref nkcache

 ################################################################################
 ## exports
--- a/mailnews/local/src/makefile.win
+++ b/mailnews/local/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= msglocal
-REQUIRES	= xpcom string msgbase msgbaseutil mailnews pref necko msgdb rdf intl mime dom rdfutil txmgr docshell msgimap chrome nkcache
+REQUIRES	= xpcom string msgbase msgsearch msgbaseutil mailnews pref necko msgdb rdf intl mime dom rdfutil txmgr docshell msgimap chrome nkcache

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/mime/emitters/build/makefile.win
+++ b/mailnews/mime/emitters/build/makefile.win
@ -26,7 +26,7 @@
 #

 DEPTH=..\..\..\..
-MODULE          = emitter
+MODULE          = mimeemitter
 LIBRARY_NAME    = emitter
 META_COMPONENT  = mail
 MODULE_NAME  = nsMimeEmitterModule
--- a/mailnews/mime/emitters/src/makefile.win
+++ b/mailnews/mime/emitters/src/makefile.win
@ -21,6 +21,7 @@

 DEPTH=..\..\..\..
 MODULE=mimeemitter
+REQUIRES	= xpcom string mime msgbase msgbaseutil pref necko intl locale mailnews msgdb addrbook mimetype msgnews

 include <$(DEPTH)\config\config.mak>

@ -28,7 +29,7 @@ include <$(DEPTH)\config\config.mak>
 ## exports

 EXPORTS=	nsEmitterUtils.h	\
-    		nsMimeRebuffer.h	\
+			nsMimeRebuffer.h	\
 			nsMimeHtmlEmitter.h	\
 			nsMimeRawEmitter.h	\
 			nsMimeXmlEmitter.h	\
--- a/mailnews/mime/src/makefile.win
+++ b/mailnews/mime/src/makefile.win
@ -20,7 +20,7 @@

 DEPTH=..\..\..
 MODULE= mime
-REQUIRES	= xpcom string msgbase msgbaseutil pref js necko uconv msgcompose editor dom intl msgimap exthandler mailnews msgdb chardet caps mimetype uriloader xpconnect
+REQUIRES	= xpcom string msgbase msgbaseutil pref js necko uconv msgcompo editor dom intl msgimap exthandler mailnews msgdb chardet caps mimetype uriloader xpconnect

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/news/build/makefile.win
+++ b/mailnews/news/build/makefile.win
@ -22,7 +22,7 @@ MODULE          = msgnews
 LIBRARY_NAME    = msgnews
 META_COMPONENT  = mail
 MODULE_NAME  = nsMsgNewsModule
-REQUIRES	= xpcom string mailnews msgbase msgbaseutil msgdb appshell timer mime necko rdf rdfutil pref uriloader nkcache layout dom intl
+REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil msgdb appshell timer mime necko rdf rdfutil pref uriloader nkcache layout dom intl raptor layout_xul

 ################################################################################
 ## exports
--- a/mailnews/news/src/makefile.win
+++ b/mailnews/news/src/makefile.win
@ -21,7 +21,7 @@

 DEPTH=..\..\..
 MODULE= msgnews
-REQUIRES	= xpcom string mailnews msgbase msgbaseutil necko msgdb locale mork dom rdf docshell layout pref uriloader appshell mime intl timer webshell wallet rdfutil nkcache windowwatcher
+REQUIRES	= xpcom string mailnews msgbase msgsearch msgbaseutil necko msgdb locale mork dom rdf docshell layout pref uriloader appshell mime intl timer webshell wallet rdfutil nkcache windowwatcher raptor layout_xul

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/public/makefile.win
+++ b/mailnews/public/makefile.win
@ -1,34 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=mailnewspublic
-
-XPIDLSRCS =				\
-		.\MailNewsTypes2.idl	\
-		$(NULL)
-
-EXPORTS = MailNewsTypes.h \
-        $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-