bug 63083 mailnews makefiles use EXPORTS instead of INCLUDES, part patch r=bsmedberg,sr=dmose

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
 

mailnews/base/search/src/Makefile.in

@@ -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 \

mailnews/base/src/Makefile.in

@@ -169,42 +169,10 @@ endif
 
 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
 

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"

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"

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)

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:

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

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
 

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

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"

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
 

mailnews/imap/src/Makefile.in

@@ -79,21 +79,7 @@ REQUIRES	= xpcom \
 
 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		= \

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