Bug 451988 – Move MailNewsTypes* from mailnews to msgbase
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 26 Aug 2008 22:40:20 +0100
changeset 197 4b62be6f26a175cd35cd891222ab32797123c299
parent 196 303365143db16620c1214c5a3b483ffb6b4020fb
child 198 fed6a9adfb61c1bacdc38334b70bd4b38ec3cba4
push idunknown
push userunknown
push dateunknown
bugs451988
Bug 451988 – Move MailNewsTypes* from mailnews to msgbase p=me r=standard8 sr=neil
mail/components/build/Makefile.in
mail/components/migration/src/Makefile.in
mailnews/Makefile.in
mailnews/addrbook/src/Makefile.in
mailnews/base/build/Makefile.in
mailnews/base/public/MailNewsTypes.h
mailnews/base/public/MailNewsTypes2.idl
mailnews/base/public/Makefile.in
mailnews/base/search/src/Makefile.in
mailnews/base/util/Makefile.in
mailnews/build/Makefile.in
mailnews/compose/build/Makefile.in
mailnews/compose/src/Makefile.in
mailnews/db/msgdb/build/Makefile.in
mailnews/db/msgdb/src/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/src/Makefile.in
mailnews/extensions/mailviews/build/Makefile.in
mailnews/extensions/mailviews/src/Makefile.in
mailnews/extensions/mdn/build/Makefile.in
mailnews/extensions/mdn/src/Makefile.in
mailnews/extensions/palmsync/src/Makefile.in
mailnews/imap/build/Makefile.in
mailnews/imap/src/Makefile.in
mailnews/imap/test/Makefile.in
mailnews/import/eudora/src/Makefile.in
mailnews/import/oexpress/Makefile.in
mailnews/import/outlook/src/Makefile.in
mailnews/import/src/Makefile.in
mailnews/local/build/Makefile.in
mailnews/local/src/Makefile.in
mailnews/makefiles.sh
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/build/Makefile.in
mailnews/mime/cthandlers/calendar/Makefile.in
mailnews/mime/cthandlers/glue/Makefile.in
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/emitters/src/Makefile.in
mailnews/mime/src/Makefile.in
mailnews/news/build/Makefile.in
mailnews/news/src/Makefile.in
mailnews/public/MailNewsTypes.h
mailnews/public/MailNewsTypes2.idl
mailnews/public/Makefile.in
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -60,17 +60,16 @@ REQUIRES = \
 	xpcom \
 	xulapp \
 	mailprofilemigration \
 	string \
 	libreg \
 	intl \
 	pref \
 	msgbase \
-	mailnews \
 	import \
 	shellservice \
 	$(NULL)
 
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -25,17 +25,16 @@ REQUIRES = \
 	dom \
 	pref \
 	rdf \
 	necko \
 	intl \
 	uconv \
 	import \
 	msgbase \
-	mailnews \
 	$(NULL)
 
 CPPSRCS = \
 	nsProfileMigrator.cpp \
 	nsMailProfileMigratorUtils.cpp \
 	nsNetscapeProfileMigratorBase.cpp \
 	nsSeamonkeyProfileMigrator.cpp \
 	$(NULL)
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -44,17 +44,17 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
 PACKAGE_FILE = mailnews.pkg
 PACKAGE_VARS += \
 		MOZ_MOVEMAIL \
 		MOZ_STATIC_MAIL_BUILD \
 		$(NULL)
 
-DIRS		= public base db/msgdb news local mime compose imap addrbook import extensions
+DIRS		= base db/msgdb news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 DIRS		+= mapi
 endif
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -58,17 +58,16 @@ REQUIRES	= xpcom \
 		  layout \
 		  widget \
 		  mork \
 		  pref \
 		  necko \
 		  locale \
 		  unicharutil \
 		  uconv \
-		  mailnews \
 		  msgbase \
 		  msgbaseutil \
 		  mime \
 		  intl \
 		  windowwatcher \
 		  uriloader \
 		  embed_base \
 		  $(NULL)
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -64,17 +64,16 @@ REQUIRES	= xpcom \
 		  rdf \
 		  content \
 		  dom \
 		  docshell \
 		  widget \
 		  layout \
 		  mime \
 		  uriloader \
-		  mailnews \
 		  addrbook \
 		  mork \
 		  txmgr \
 		  pref \
 		  msgcompose \
 		  msgbaseutil \
 		  msgdb \
 		  appcomps \
rename from mailnews/public/MailNewsTypes.h
rename to mailnews/base/public/MailNewsTypes.h
rename from mailnews/public/MailNewsTypes2.idl
rename to mailnews/base/public/MailNewsTypes2.idl
--- a/mailnews/base/public/Makefile.in
+++ b/mailnews/base/public/Makefile.in
@@ -40,24 +40,26 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 
 EXPORTS		= \
+		MailNewsTypes.h \
 		msgCore.h \
 		nsMsgBaseCID.h \
 		nsMsgHeaderMasks.h \
 		nsMsgMessageFlags.h \
 		nsMsgLocalFolderHdrs.h \
 		$(NULL)
 
 XPIDLSRCS	= \
+                MailNewsTypes2.idl \
 		nsICopyMessageListener.idl \
 		nsICopyMsgStreamListener.idl \
 		nsIMessenger.idl \
 		nsIFolderListener.idl \
 		nsIMsgAccount.idl \
 		nsIMsgAccountManager.idl \
 		nsIMsgFolder.idl \
 		nsIMsgFolderCache.idl \
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -46,17 +46,16 @@ MODULE		= msgbase
 XPIDL_MODULE	= msgsearch
 LIBRARY_NAME	= msgsearch_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 EXPORT_DIR	= $(DIST)/bin/isp
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  msgdb \
 		  msgbaseutil \
 		  necko \
 		  mime \
 		  msgimap \
 		  rdf \
 		  msglocal \
 		  intl \
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -60,17 +60,16 @@ PACKAGE_FILE = msgbaseutil.pkg
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  rdf \
 		  necko \
 		  msgdb \
 		  intl \
 		  mork \
-		  mailnews \
 		  locale \
 		  pref \
 		  rdfutil \
 		  mime \
 		  caps \
 		  msgcompose \
 		  addrbook \
 		  docshell \
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -69,17 +69,16 @@ REQUIRES	= xpcom \
 		  dom \
 		  docshell \
 		  editor \
 		  gfx \
 		  intl \
 	     	  locale \
 		  layout \
 		  lwbrk \
-		  mailnews \
 	          mailview \
 	          msglocal \
 		  msgcompose \
 	          msgbase  \
 		  msgnews \
 		  msgimap \
 		  msgdb \
 		  mime \
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -65,17 +65,16 @@ REQUIRES	= xpcom \
 		  necko \
 		  dom \
 		  uriloader \
 		  mime \
 		  addrbook \
 		  rdf \
 		  intl \
 		  uconv \
-		  mailnews \
 		  pref \
 		  widget \
 		  msgdb \
 		  appcomps \
 		  toolkitcomps \
 		  nkcache \
 		  $(NULL)
 
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -49,17 +49,16 @@ MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  dom \
 		  layout \
 		  editor \
 		  uriloader \
 		  msgbase \
-		  mailnews \
 		  necko \
 		  mime \
 		  pref \
 		  intl \
 		  lwbrk \
 		  uconv \
 		  locale \
 		  unicharutil \
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@@ -49,17 +49,16 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgDBModule
 MOZILLA_INTERNAL_API = 1
 
 PACKAGE_FILE = msgdb.pkg
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  locale \
 		  mork \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  necko \
 		  $(NULL)
 
--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdb
 LIBRARY_NAME	= msgdb_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  mork \
 		  msgbase \
 		  msgbaseutil \
 		  locale \
 		  mime \
 		  necko \
 		  pref \
 		  $(NULL)
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -49,17 +49,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 MOZILLA_INTERNAL_API = 1
 
 PACKAGE_FILE = bayesian.pkg
 
 REQUIRES	= xpcom \
-		  mailnews \
 		  msgbase \
 		  lwbrk \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -47,17 +47,16 @@ LIBRARY_NAME	= bayesflt_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
 		  msgbase \
 		  necko \
-		  mailnews \
 		  msgbaseutil \
 		  lwbrk \
       mimetype \
       mime \
       pref \
 		  content \
 		  htmlparser \
 		  layout \
--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mailnews/extensions/mailviews/build/Makefile.in
@@ -49,17 +49,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= mailview
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMailViewModule
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
-		  mailnews \
 		  necko \
 		  msgbaseutil \
           	  msgdb \
           	  mime \
 		  intl \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mailview
 LIBRARY_NAME	= mailview_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
-		  mailnews \
 		  necko \
           	  mime \
 		  intl \
 		  $(NULL)
 
 CPPSRCS		= \
                 nsMsgMailViewList.cpp \
 		$(NULL)
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@@ -48,17 +48,16 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgmdn
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMdnModule
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  necko \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
-		  mailnews \
 		  necko \
 		  mime \
 		  pref \
 		  intl \
 		  msgbaseutil \
 		  msgimap \
 		  mimetype \
 		  msgcompose \
--- a/mailnews/extensions/palmsync/src/Makefile.in
+++ b/mailnews/extensions/palmsync/src/Makefile.in
@@ -57,17 +57,16 @@ REQUIRES = \
 	pref \
 	string \
 	rdf \
 	rdfutil \
 	mork \
 	unicharutil \
 	MapiProxy \
 	locale \
-	mailnews \
 	msgbase \
 	msgbaseutil \
 	necko \
 	addrbook \
 	xulapp \
 	extensions \
 	$(NULL)
 
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@@ -50,17 +50,16 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= IMAP_factory
 MOZILLA_INTERNAL_API = 1
 
 PACKAGE_FILE = msgimap.pkg
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  msgbase \
 		  msgbaseutil \
 		  rdf \
 		  rdfutil \
 		  necko \
 		  msgdb \
 		  txmgr \
 		  mime \
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
 LIBRARY_NAME	= msgimap_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  rdf \
 		  msgbase \
 		  msgbaseutil \
 		  rdfutil \
 		  necko \
 		  appshell \
 		  msgdb \
 		  dom \
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -50,17 +50,16 @@ MODULE         = test_imap
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES = 	\
 		xpcom \
 		xpcom_ds \
 		necko \
 		nkcache \
 		string \
-		mailnews \
 		msgbase \
 		msgimap \
 		$(NULL)
 
 CPP_UNIT_TESTS = \
 		TestImapHdrXferInfo \
 		$(NULL)
 
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -56,17 +56,16 @@ REQUIRES	= xpcom \
 		  addrbook \
 		  pref \
 		  mork \
 		  mime \
 		  msgcompose \
 		  msgbase \
 		  dom \
 		  editor \
-		  mailnews \
 		  msgbaseutil \
 		  msglocal \
 		  mime \
 		  mimetype \
 		  unicharutil \
 		  $(NULL)
 
 CPPSRCS		= \
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -51,17 +51,16 @@ META_COMPONENT	= mail
 REQUIRES	= xpcom \
 		  string \
 		  import \
 		  addrbook \
 		  mork \
 		  intl \
 		  msgbase \
 		  pref \
-		  mailnews \
 		  necko \
 		  msgdb \
 		  msgbaseutil \
 		  msgcompose \
 		  msglocal \
 		  msgimap \
 		  unicharutil \
 		  $(NULL)
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -55,17 +55,16 @@ REQUIRES	= xpcom \
 		  necko \
 		  addrbook \
 		  mork \
 		  msgcompose \
 		  msgbase \
 		  editor \
 		  dom \
 		  uriloader \
-		  mailnews \
 		  msgbaseutil \
 		  msgdb \
 		  msglocal \
 		  mimetype \
 		  unicharutil \
 		  pref \
 		  $(NULL)
 
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = import
 LIBRARY_NAME = import_s
 
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  addrbook \
 		  uconv \
 		  msgbase \
 		  intl \
 		  necko \
 		  rdf \
 		  unicharutil \
 		  $(NULL)
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@@ -51,17 +51,16 @@ IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
 MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 PACKAGE_FILE = msglocal.pkg
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  necko \
 		  txmgr \
 		  rdf \
 		  rdfutil \
 		  mime \
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -46,17 +46,16 @@ MODULE		= msglocal
 LIBRARY_NAME	= msglocal_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  msgbaseutil \
-		  mailnews \
 		  pref \
 		  necko \
 		  msgdb \
 		  rdf \
 		  intl \
 		  unicharutil \
 		  mime \
 		  dom \
--- a/mailnews/makefiles.sh
+++ b/mailnews/makefiles.sh
@@ -80,17 +80,16 @@ mailnews/mime/emitters/build/Makefile
 mailnews/mime/emitters/src/Makefile
 mailnews/mime/public/Makefile
 mailnews/mime/src/Makefile
 mailnews/mime/build/Makefile
 mailnews/compose/Makefile
 mailnews/compose/public/Makefile
 mailnews/compose/src/Makefile
 mailnews/compose/build/Makefile
-mailnews/public/Makefile
 mailnews/import/Makefile
 mailnews/import/build/Makefile
 mailnews/import/public/Makefile
 mailnews/import/src/Makefile
 mailnews/import/text/Makefile
 mailnews/import/text/src/Makefile
 mailnews/import/eudora/Makefile
 mailnews/import/eudora/src/Makefile
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -57,17 +57,16 @@ REQUIRES	= xpcom \
 		  appcomps \
 		  windowwatcher \
 		  dom \
 		  profile \
 		  msgbase \
 		  pref \
 		  msgbaseutil \
 		  msgcompose \
-		  mailnews \
       mime \
       msgimap \
 		  necko \
 		  intl \
 		  editor \
 		  msgdb \
 		  uriloader \
 		  unicharutil \
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@@ -52,17 +52,16 @@ MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 PACKAGE_FILE = mime.pkg
 
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  msgbase \
-		  mailnews \
 		  pref \
 		  uconv \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
--- a/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mailnews/mime/cthandlers/calendar/Makefile.in
@@ -61,17 +61,16 @@ REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  uconv \
 		  necko \
 		  intl \
 		  pref \
-		  mailnews \
 		  msgdb \
 		  addrbook \
 		  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= calendar.map
 DEFFILE		= $(win_srcdir)/calendar.def
 endif
--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mailnews/mime/cthandlers/glue/Makefile.in
@@ -49,17 +49,16 @@ EXPORT_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  pref \
 		  uconv \
 		  necko \
 		  msgbase \
-		  mailnews \
 		  $(NULL)
 
 CPPSRCS		= \
 		mimexpcom.cpp \
 		nsMimeContentTypeHandler.cpp \
 		$(NULL)
 
 EXPORTS     = nsMimeContentTypeHandler.h
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -63,17 +63,16 @@ REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  uconv \
 		  necko \
 		  intl \
 		  pref \
-		  mailnews \
 		  addrbook \
 		  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= vcard.map
 DEFFILE		= $(win_srcdir)/vcard.def
 endif
 
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@@ -51,17 +51,16 @@ REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  pref \
 		  necko \
 		  intl \
 		  locale \
-		  mailnews \
 		  mimetype \
 		  msgnews \
 		  unicharutil \
 		  $(NULL)
 
 EXPORTS		= \
 		nsMimeEmitterCID.h \
 		$(NULL)
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -64,17 +64,16 @@ REQUIRES	= xpcom \
 		  necko \
 		  uconv \
 		  unicharutil \
 		  msgcompose \
 		  dom \
 		  intl \
 		  msgimap \
 		  exthandler \
-		  mailnews \
 		  chardet \
 		  caps \
 		  mimetype \
 		  xpconnect \
 		  nkcache \
 		  pipnss \
 		  imglib2 \
 		  content \
--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@@ -49,17 +49,16 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgNewsModule
 MOZILLA_INTERNAL_API = 1
 
 PACKAGE_FILE = msgnews.pkg
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  appcomps \
 		  toolkitcomps \
 		  mime \
 		  necko \
 		  rdf \
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgnews
 LIBRARY_NAME	= msgnews_s
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
-		  mailnews \
 		  msgbase \
 		  msgbaseutil \
 		  necko \
 		  msgdb \
 		  locale \
 		  mork \
 		  dom \
 		  rdf \
deleted file mode 100644
--- a/mailnews/public/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mailnews
-
-EXPORTS		= \
-		MailNewsTypes.h \
-		$(NULL)
-
-XPIDLSRCS	= MailNewsTypes2.idl
-
-include $(topsrcdir)/config/rules.mk
-