Bug 131849 addressbook build system requires exporting internal files

patch by mark@standard8.demon.co.uk r=bryner

mailnews/addrbook/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/addrbook/src/Makefile.in

@@ -106,43 +106,13 @@ CPPSRCS		= \
 
 EXPORTS		= \
 		nsAbBaseCID.h \
-		nsAddressBook.h \
-		nsAddrBookSession.h \
-		nsAbRDFDataSource.h \
-		nsDirectoryDataSource.h \
-		nsAbCardProperty.h \
 		nsDirPrefs.h \
-		nsAddrDatabase.h \
-		nsAbDirProperty.h \
-		nsAbAutoCompleteSession.h \
-		nsAbAddressCollecter.h \
-		nsAddbookProtocolHandler.h  \
-		nsAddbookUrl.h  \
-		nsAbMDBDirProperty.h \
-		nsAbMDBDirectory.h \
-		nsAbMDBCardProperty.h \
-		nsAbMDBCard.h \
-		nsAbBSDirectory.h \
-		nsAbDirFactoryService.h	\
-		nsAbMDBDirFactory.h	\
-		nsAbDirectoryQuery.h    \
-		nsAbDirectoryQueryProxy.h    \
-                nsAbDirSearchListener.h \
-		nsAbBooleanExpression.h \
-                nsAbDirectoryRDFResource.h \
-                nsAbView.h \
                 nsVCard.h \
                 nsVCardObj.h \
-                nsMsgVCardService.h \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
-EXPORTS		+= \
-		nsAbOutlookCard.h \
-		nsAbOutlookDirFactory.h \
-		nsAbOutlookDirectory.h \
-		$(NULL)
 
 CPPSRCS		+= \
 		nsAbOutlookCard.cpp \
@@ -160,18 +130,6 @@ ifdef MOZ_LDAP_XPCOM
 REQUIRES    += mozldap \
                $(NULL)
 
-EXPORTS		+= nsAbLDAPDirectoryQuery.h \
-		nsAbLDAPDirectory.h \
-		nsAbLDAPDirFactory.h \
-		nsAbLDAPCard.h \
-		nsAbLDAPAutoCompFormatter.h \
-                nsAbLDAPReplicationService.h \
-                nsAbLDAPReplicationQuery.h \
-                nsAbLDAPReplicationData.h \
-                nsAbLDAPChangeLogQuery.h \
-                nsAbLDAPChangeLogData.h \
-		$(NULL)
-
 CPPSRCS		+= nsAbLDAPDirectory.cpp \
 		nsAbLDAPDirFactory.cpp	\
                 nsAbLDAPCard.cpp \

mailnews/addrbook/src/nsAbBaseCID.h

@@ -41,7 +41,6 @@
 #include "nsISupports.h"
 #include "nsIFactory.h"
 #include "nsIComponentManager.h"
-#include "nsAbDirFactoryService.h"
 
 //
 // nsAddressBook

mailnews/build/Makefile.in

@@ -150,6 +150,7 @@ endif
 LOCAL_INCLUDES = -I$(srcdir) \
                  -I$(srcdir)/../base/src \
                  -I$(srcdir)/../local/src \
+                 -I$(srcdir)/../addrbook/src \
                  $(NULL)
 
 include $(topsrcdir)/config/rules.mk

mailnews/import/text/src/nsTextAddress.cpp

@@ -41,7 +41,8 @@
 
 #include "nsIServiceManager.h"
 #include "nsIImportService.h"
-#include "nsAddrDatabase.h"
+#include "nsIAddrDatabase.h"
+#include "mdb.h"
 #include "nsAbBaseCID.h"
 #include "nsIAbCard.h"
 #include "nsReadableUtils.h"