From 83b313ff091abc284bb9965c6981766b57b15d89 Mon Sep 17 00:00:00 2001 From: "bugzilla%standard8.demon.co.uk" Date: Wed, 24 Aug 2005 16:49:22 +0000 Subject: [PATCH] bug 63083 mailnews makefiles use EXPORTS instead of INCLUDES, part patch r=bsmedberg,sr=dmose git-svn-id: svn://10.0.0.236/trunk@178793 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/build/Makefile.in | 6 +++- mozilla/mailnews/base/search/src/Makefile.in | 8 +---- mozilla/mailnews/base/src/Makefile.in | 34 +------------------ .../mailnews/base/src/nsMsgAccountManager.cpp | 2 +- .../base/src/nsMsgAccountManagerDS.cpp | 1 - .../base/util/nsImapMoveCoalescer.cpp | 4 +-- .../mailnews/base/util/nsImapMoveCoalescer.h | 5 +-- mozilla/mailnews/build/Makefile.in | 4 +++ mozilla/mailnews/compose/build/Makefile.in | 1 + mozilla/mailnews/compose/src/Makefile.in | 28 --------------- .../compose/src/nsMsgComposeService.cpp | 2 +- mozilla/mailnews/imap/build/Makefile.in | 1 + mozilla/mailnews/imap/src/Makefile.in | 16 +-------- mozilla/mailnews/makefiles | 1 - 14 files changed, 19 insertions(+), 94 deletions(-) diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in index c3aa7460c9b..a3ea363b2a0 100644 --- a/mozilla/mailnews/base/build/Makefile.in +++ b/mozilla/mailnews/base/build/Makefile.in @@ -111,7 +111,11 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_XPCOM_OBSOLETE_LIBS) \ $(NULL) -LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../src +LOCAL_INCLUDES += -I$(srcdir) \ + -I$(srcdir)/../src \ + -I$(srcdir)/../search/src \ + -I$(srcdir)/../util \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/search/src/Makefile.in b/mozilla/mailnews/base/search/src/Makefile.in index f08f00e6bd3..eebe54149d5 100644 --- a/mozilla/mailnews/base/search/src/Makefile.in +++ b/mozilla/mailnews/base/search/src/Makefile.in @@ -68,7 +68,7 @@ REQUIRES = xpcom \ txmgr \ import \ addrbook \ - docshell \ + docshell \ $(NULL) CPPSRCS = \ @@ -87,12 +87,6 @@ CPPSRCS = \ nsMsgFilterDelegateFactory.cpp \ $(NULL) -EXPORTS = nsMsgFilterService.h \ - nsMsgSearchSession.h \ - nsMsgFilterDataSource.h \ - nsMsgFilterDelegateFactory.h \ - $(NULL) - EXPORT_RESOURCE_FILES = \ SpamAssassin.sfd \ SpamPal.sfd \ diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in index 34a481941f0..b9509d108f3 100644 --- a/mozilla/mailnews/base/src/Makefile.in +++ b/mozilla/mailnews/base/src/Makefile.in @@ -167,44 +167,12 @@ endif endif -EXPORTS = \ +EXPORTS = \ nsMsgBaseCID.h \ - nsMessenger.h \ - nsMessengerBootstrap.h \ - nsUrlListenerManager.h \ - nsMsgMailSession.h \ - nsMsgAccountManager.h \ - nsMsgAccount.h \ - nsMsgFolderDataSource.h \ - nsMsgFolderCache.h \ - nsMsgAccountManagerDS.h \ nsMsgRDFDataSource.h \ nsMsgRDFUtils.h \ - nsMsgBiffManager.h \ - nsMsgPurgeService.h \ - nsCopyMessageStreamListener.h \ - nsMsgCopyService.h \ - nsMsgStatusFeedback.h \ - nsMsgWindow.h \ - nsMessengerMigrator.h \ - nsMsgServiceProvider.h \ - nsSubscribeDataSource.h \ - nsSubscribableServer.h \ - nsMsgPrintEngine.h \ - nsStatusBarBiffManager.h \ - nsMsgProgress.h \ - nsMessengerContentHandler.h \ $(NULL) -ifdef MOZ_THUNDERBIRD -EXPORTS += nsMsgContentPolicy.h - -ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT))) -EXPORTS += nsMessengerOSXIntegration.h -endif - -endif - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp index d13341b0d9a..2cbde65027e 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp @@ -87,7 +87,7 @@ #include "nsIMessengerOSIntegration.h" #include "nsICategoryManager.h" #include "nsISupportsPrimitives.h" -#include "nsMsgFilterService.h" +#include "nsIMsgFilterService.h" #include "nsIMsgFilter.h" #include "nsIMsgSearchSession.h" #include "nsIDBChangeListener.h" diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp index 78120a677d5..b81f8e009e5 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp @@ -55,7 +55,6 @@ #include "nsMsgRDFUtils.h" #include "nsIMsgFolder.h" #include "nsMsgBaseCID.h" -#include "nsMsgIncomingServer.h" #include "nsICategoryManager.h" #include "nsXPCOM.h" diff --git a/mozilla/mailnews/base/util/nsImapMoveCoalescer.cpp b/mozilla/mailnews/base/util/nsImapMoveCoalescer.cpp index 0d511eb0649..4830e864d27 100755 --- a/mozilla/mailnews/base/util/nsImapMoveCoalescer.cpp +++ b/mozilla/mailnews/base/util/nsImapMoveCoalescer.cpp @@ -37,14 +37,14 @@ #include "msgCore.h" #include "nsMsgImapCID.h" -#include "nsImapMailFolder.h" #include "nsImapMoveCoalescer.h" #include "nsMsgKeyArray.h" -#include "nsImapService.h" +#include "nsIImapService.h" #include "nsIMsgCopyService.h" #include "nsMsgBaseCID.h" #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later... #include "nsMsgFolderFlags.h" +#include "nsIMsgHdr.h" NS_IMPL_ISUPPORTS1(nsImapMoveCoalescer, nsISupports) diff --git a/mozilla/mailnews/base/util/nsImapMoveCoalescer.h b/mozilla/mailnews/base/util/nsImapMoveCoalescer.h index 34ca42f45ca..0ba9adedd8b 100755 --- a/mozilla/mailnews/base/util/nsImapMoveCoalescer.h +++ b/mozilla/mailnews/base/util/nsImapMoveCoalescer.h @@ -39,9 +39,8 @@ #define _nsImapMoveCoalescer_H #include "msgCore.h" -class nsImapMailFolder; - #include "nsISupportsArray.h" +#include "nsIMsgWindow.h" #include "nsCOMPtr.h" // imap move coalescer class - in order to keep nsImapMailFolder from growing like Topsy @@ -50,8 +49,6 @@ class nsImapMailFolder; // This utility class will be used by both the filter code and the offline playback code, // to avoid multiple moves to the same folder. -#include "nsISupportsArray.h" - class NS_MSG_BASE nsImapMoveCoalescer : public nsISupports { public: diff --git a/mozilla/mailnews/build/Makefile.in b/mozilla/mailnews/build/Makefile.in index 10801776195..b1adc045543 100644 --- a/mozilla/mailnews/build/Makefile.in +++ b/mozilla/mailnews/build/Makefile.in @@ -151,8 +151,12 @@ endif LOCAL_INCLUDES = -I$(srcdir) \ -I$(srcdir)/../base/src \ + -I$(srcdir)/../base/util \ -I$(srcdir)/../local/src \ -I$(srcdir)/../addrbook/src \ + -I$(srcdir)/../imap/src \ + -I$(srcdir)/../compose/src \ + -I$(srcdir)/../base/search/src \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in index 570d0c6fda2..89ba1acc624 100644 --- a/mozilla/mailnews/compose/build/Makefile.in +++ b/mozilla/mailnews/compose/build/Makefile.in @@ -39,6 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ +LOCAL_INCLUDES += -I$(srcdir)/../src include $(DEPTH)/config/autoconf.mk diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in index 2f75c3a388a..37318642a88 100644 --- a/mozilla/mailnews/compose/src/Makefile.in +++ b/mozilla/mailnews/compose/src/Makefile.in @@ -123,34 +123,6 @@ CPPSRCS = \ EXPORTS = \ nsMsgCompCID.h \ - nsSmtpUrl.h \ - nsSmtpProtocol.h \ - nsSmtpService.h \ - nsMsgCreate.h \ - nsMsgCopy.h \ - nsMsgSendLater.h \ - nsMsgDeliveryListener.h \ - nsMsgComposeStringBundle.h \ - nsMsgEncoders.h \ - nsMsgCompUtils.h \ - nsMsgComposeService.h \ - nsMsgComposeParams.h \ - nsMsgComposeProgressParams.h \ - nsMsgComposeContentHandler.h \ - nsMsgCompose.h \ - nsMsgCompFields.h \ - nsMsgAttachment.h \ - nsMsgAttachmentHandler.h \ - nsMsgPrompts.h \ - nsMsgQuote.h \ - nsMsgRecipientArray.h \ - nsURLFetcher.h \ - nsMsgSend.h \ - nsMsgSendReport.h \ - nsMsgSimulateError.h \ - nsSmtpServer.h \ - nsSmtpDataSource.h \ - nsSmtpDelegateFactory.h \ $(NULL) # MacOSX requires the MoreFiles module diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 7d9dd3cdc85..e62b3da60c2 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -61,7 +61,7 @@ #include "nsIDOMWindow.h" #include "nsEscape.h" #include "nsIContentViewer.h" -#include "nsMsgWindow.h" +#include "nsIMsgWindow.h" #include "nsIDocShell.h" #include "nsIScriptGlobalObject.h" #include "nsIDOMDocument.h" diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in index 2acdb9dc4d5..4872056873b 100644 --- a/mozilla/mailnews/imap/build/Makefile.in +++ b/mozilla/mailnews/imap/build/Makefile.in @@ -39,6 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ +LOCAL_INCLUDES += -I$(srcdir)/../src include $(DEPTH)/config/autoconf.mk diff --git a/mozilla/mailnews/imap/src/Makefile.in b/mozilla/mailnews/imap/src/Makefile.in index 9a3a7a3e8e6..5d3949296ce 100644 --- a/mozilla/mailnews/imap/src/Makefile.in +++ b/mozilla/mailnews/imap/src/Makefile.in @@ -77,23 +77,9 @@ REQUIRES = xpcom \ embed_base \ $(NULL) -EXPORTS = \ +EXPORTS = \ nsMsgImapCID.h \ - nsIMAPBodyShell.h \ - nsIMAPGenericParser.h \ - nsIMAPHostSessionList.h \ - nsIMAPNamespace.h \ nsImapCore.h \ - nsImapFlagAndUidState.h \ - nsImapIncomingServer.h \ - nsImapMailFolder.h \ - nsImapProtocol.h \ - nsImapProxyEvent.h \ - nsImapSearchResults.h \ - nsImapServerResponseParser.h \ - nsImapService.h \ - nsImapUrl.h \ - nsImapUtils.h \ $(NULL) CPPSRCS = \ diff --git a/mozilla/mailnews/makefiles b/mozilla/mailnews/makefiles index 1f1a639b7df..94161d4e059 100644 --- a/mozilla/mailnews/makefiles +++ b/mozilla/mailnews/makefiles @@ -11,7 +11,6 @@ mailnews/base/build/Makefile mailnews/base/search/Makefile mailnews/base/search/public/Makefile mailnews/base/search/src/Makefile -mailnews/base/search/resources/content/Makefile mailnews/base/resources/Makefile mailnews/base/resources/content/Makefile mailnews/base/resources/content/unix/Makefile