Bug 376344 Simplify inclusion of platformMailnewsOverlay.xul in messenger.jar. r=Neil,sr=mscott

mailnews/base/Makefile.in

@@ -43,7 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
-DIRS		= public src util search ispdata resources
+DIRS		= public src util search ispdata
 
 ifndef MOZ_STATIC_MAIL_BUILD
 DIRS += build

mailnews/jar.mn

@@ -209,4 +209,17 @@ messenger.jar:
     content/messenger/markByDate.xul                                           (base/resources/content/markByDate.xul)
     content/messenger/dateFormat.js                                            (base/resources/content/dateFormat.js)
     content/messenger/start.xhtml                                              (base/resources/content/start.xhtml)
+#ifdef XP_MACOSX
+    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/mac/platformMailnewsOverlay.xul)
+#else
+#ifdef XP_WIN32
+    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/win/platformMailnewsOverlay.xul)
+#else
+#ifdef XP_OS2
+    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/win/platformMailnewsOverlay.xul)
+#else
+    content/messenger/platformMailnewsOverlay.xul                              (base/resources/content/unix/platformMailnewsOverlay.xul)
+#endif
+#endif
+#endif
 #endif

mailnews/makefiles

@@ -4,16 +4,14 @@ mailnews/addrbook/build/Makefile
 mailnews/addrbook/public/Makefile
 mailnews/addrbook/src/Makefile
 mailnews/base/Makefile
+mailnews/base/build/Makefile
+mailnews/base/ispdata/Makefile
 mailnews/base/public/Makefile
 mailnews/base/src/Makefile
 mailnews/base/util/Makefile
-mailnews/base/build/Makefile
 mailnews/base/search/Makefile
 mailnews/base/search/public/Makefile
 mailnews/base/search/src/Makefile
-mailnews/base/resources/Makefile
-mailnews/base/resources/content/Makefile
-mailnews/base/resources/content/unix/Makefile
 mailnews/build/Makefile
 mailnews/db/Makefile
 mailnews/db/msgdb/Makefile