Bug 63083 mailnews makefiles use EXPORTS instead of INCLUDES. Part 2. r=bsmedberg,sr=dmose

mailnews/import/build/Makefile.in

@@ -108,6 +108,24 @@ endif
 
 endif
 
+LOCAL_INCLUDES += -I$(srcdir)/../src \
+	-I$(srcdir)/../comm4x/src \
+	-I$(srcdir)/../text/src \
+	$(NULL)
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+LOCAL_INCLUDES += -I$(srcdir)/../eudora/src
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+LOCAL_INCLUDES += -I$(srcdir)/../eudora/src
+ifndef GNU_CC
+LOCAL_INCLUDES += -I$(srcdir)/../oexpress \
+	-I$(srcdir)/../outlook/src \
+  -I$(NULL)
+endif
+endif
+
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \

mailnews/import/comm4x/src/Makefile.in

@@ -107,13 +107,6 @@ EXTRA_DSO_LDOPTS = \
 
 else
 
-EXPORTS     = \
-            nsComm4xProfile.h               \
-	    nsComm4xMailStringBundle.h      \
-	    nsComm4xMailImport.h	    \
-	    nsComm4xMail.h		    \
-            $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/import/eudora/src/Makefile.in

@@ -123,11 +123,6 @@ endif
 
 else
 
-EXPORTS     = \
-            nsEudoraImport.h               \
-	    nsEudoraStringBundle.h         \
-            $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/import/oexpress/Makefile.in

@@ -108,11 +108,6 @@ EXTRA_DSO_LDOPTS = \
 
 else
 
-EXPORTS     = \
-            nsOEImport.h               \
-	    nsOEStringBundle.h	       \
-            $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/import/outlook/src/Makefile.in

@@ -113,11 +113,6 @@ EXTRA_DSO_LDOPTS = \
 
 else
 
-EXPORTS     = \
-            nsOutlookImport.h               \
-            nsOutlookStringBundle.h         \
-            $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/import/src/Makefile.in

@@ -111,16 +111,6 @@ EXTRA_DSO_LDOPTS += \
 
 else
 
-EXPORTS     = \
-            nsImportService.h               \
-            nsImportMimeEncode.h            \
-            nsImportScanFile.h              \
-            ImportOutFile.h                 \
-            nsImportEncodeScan.h            \
-            nsImportTranslator.h            \
-            nsImportStringBundle.h          \
-            $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/import/text/src/Makefile.in

@@ -87,11 +87,6 @@ EXTRA_DSO_LDOPTS = \
 
 else
 
-EXPORTS     = \
-           nsTextImport.h     \
-           nsTextStringBundle.h \
-           $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1