giant cleanup of Windows mail / news makefile.wins. properly use MODULE, and name things so that Windows and UNIX match. (a big checkin for UNIX proceeded this.)

2025-01-19 01:10:22 +00:00 · 1999-06-08 02:22:10 +00:00 · 1999-06-08 02:22:10 +00:00 · 026c93aa61
commit 026c93aa61
parent 7e2352ba3a
29 changed files with 26 additions and 50 deletions
--- a/db/mdb/public/makefile.win
+++ b/db/mdb/public/makefile.win
@ -17,15 +17,13 @@

 DEPTH=..\..\..\..

-MODULE=msgdb
+MODULE=msgmdb

-IDLSRCS =							\
+XPIDLSRCS =							\
 			$(NULL)

 EXPORTS =	 						\
 			mdb.h    \
 			$(NULL)

-
-
 include <$(DEPTH)\config\rules.mak>
--- a/mailnews/addrbook/build/makefile.win
+++ b/mailnews/addrbook/build/makefile.win
@ -16,7 +16,7 @@
 # Reserved.

 DEPTH=..\..\..
-MODULE=addressbook 
+MODULE=addrbook 

 ################################################################################
 ## exports
--- a/mailnews/addrbook/prefs/resources/content/makefile.win
+++ b/mailnews/addrbook/prefs/resources/content/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..\..

-MODULE=mailnews
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/addrbook/public/makefile.win
+++ b/mailnews/addrbook/public/makefile.win
@ -16,7 +16,7 @@
 # Reserved.

 DEPTH=..\..\..
-MODULE=addressbook
+MODULE=addrbook

 XPIDLSRCS =						 \
 			.\nsIAbBase.idl		 \
--- a/mailnews/addrbook/resources/content/makefile.win
+++ b/mailnews/addrbook/resources/content/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..

-MODULE=addrbook
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/addrbook/src/makefile.win
+++ b/mailnews/addrbook/src/makefile.win
@ -16,7 +16,7 @@
 # Reserved.

 DEPTH=..\..\..
-MODULE= addressbook
+MODULE= addrbook

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/base/prefs/resources/content/makefile.win
+++ b/mailnews/base/prefs/resources/content/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..\..

-MODULE=msgbase
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/base/prefs/resources/skin/makefile.win
+++ b/mailnews/base/prefs/resources/skin/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..\..

-MODULE=msgbase
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/base/resources/content/makefile.win
+++ b/mailnews/base/resources/content/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..

-MODULE=msgbase
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/base/resources/skin/makefile.win
+++ b/mailnews/base/resources/skin/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..

-MODULE=msgbase
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/base/search/public/makefile.win
+++ b/mailnews/base/search/public/makefile.win
@ -17,7 +17,7 @@

 DEPTH=..\..\..\..

-IDLSRCS =							\
+XPIDLSRCS =							\
 			$(NULL)

 EXPORTS =	 						\
@ -31,7 +31,7 @@ EXPORTS =	 						\
 			nsMsgSearchCore.h \
 			$(NULL)

-MODULE=mailnews
+MODULE=msgsearch


 include <$(DEPTH)\config\rules.mak>
--- a/mailnews/base/search/resources/content/makefile.win
+++ b/mailnews/base/search/resources/content/makefile.win
@ -17,9 +17,6 @@

 DEPTH=..\..\..\..\..

-DEFINES=-DWIN32_LEAN_AND_MEAN
-MODULE=msgbase
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/base/search/src/makefile.win
+++ b/mailnews/base/search/src/makefile.win
@ -21,10 +21,9 @@ IGNORE_MANIFEST=1
 include <$(DEPTH)\config\config.mak>

 LIBRARY_NAME=msgsearch
-MODULE= mailnews
+MODULE=msgsearch

-
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
+DEFINES=-D_IMPL_NS_HTML

 CPPSRCS=    nsMsgFilterService.cpp\
 			nsMsgFilterList.cpp\
--- a/mailnews/base/tests/makefile.win
+++ b/mailnews/base/tests/makefile.win
@ -18,7 +18,8 @@
 # New build system where zip dll is build indepenant of java stubs.
 #//
 #//------------------------------------------------------------------------
-MODULE =testmsgfactory
+MODULE =msgbasetest
+
 #EXPORTS =               \
 #        $(NULL)

--- a/mailnews/compose/public/makefile.win
+++ b/mailnews/compose/public/makefile.win
@ -18,8 +18,8 @@
 DEPTH=..\..\..
 MODULE=msgcompose

-IDLSRCS =							\
-			nsIMsgCompose.idl		\
+# nsIMsgCompose.idl nsIMsgSend.idl soon
+XPIDLSRCS =							\
 			$(NULL)

 ################################################################################
--- a/mailnews/compose/resources/content/makefile.win
+++ b/mailnews/compose/resources/content/makefile.win
@ -17,8 +17,6 @@

 DEPTH=..\..\..\..

-MODULE=msgcompose
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/compose/tests/compose/makefile.win
+++ b/mailnews/compose/tests/compose/makefile.win
@ -18,7 +18,7 @@
 # New build system where zip dll is build indepenant of java stubs.
 #//
 #//------------------------------------------------------------------------
-MODULE =testmsgcompose
+MODULE =msgcomposetest
 #EXPORTS =               \
 #        $(NULL)

--- a/mailnews/db/mdb/public/makefile.win
+++ b/mailnews/db/mdb/public/makefile.win
@ -17,15 +17,13 @@

 DEPTH=..\..\..\..

-MODULE=msgdb
+MODULE=msgmdb

-IDLSRCS =							\
+XPIDLSRCS =							\
 			$(NULL)

 EXPORTS =	 						\
 			mdb.h    \
 			$(NULL)

-
-
 include <$(DEPTH)\config\rules.mak>
--- a/mailnews/db/msgdb/public/makefile.win
+++ b/mailnews/db/msgdb/public/makefile.win
@ -18,7 +18,7 @@
 DEPTH=..\..\..\..
 MODULE=msgdb

-IDLSRCS =				\
+XPIDLSRCS =				\
 			$(NULL)

 ################################################################################
--- a/mailnews/imap/tests/harness/makefile.win
+++ b/mailnews/imap/tests/harness/makefile.win
@ -18,7 +18,7 @@
 # New build system where zip dll is build indepenant of java stubs.
 #//
 #//------------------------------------------------------------------------
-MODULE =testimap
+MODULE =msgimaptest
 #EXPORTS =               \
 #        $(NULL)

--- a/mailnews/mime/cthandlers/resources/makefile.win
+++ b/mailnews/mime/cthandlers/resources/makefile.win
@ -17,9 +17,6 @@
 DEPTH=..\..\..\..
 IGNORE_MANIFEST=1

-DEFINES=-DWIN32_LEAN_AND_MEAN
-MODULE=vcard
-
 include <$(DEPTH)\config\rules.mak>

 install:: 
--- a/mailnews/mime/emitters/html/makefile.win
+++ b/mailnews/mime/emitters/html/makefile.win
@ -22,7 +22,7 @@
 #

 DEPTH=..\..\..\..
-MODULE=mime
+MODULE=htmlemitter

 ################################################################################
 ## exports
--- a/mailnews/mime/emitters/raw/makefile.win
+++ b/mailnews/mime/emitters/raw/makefile.win
@ -15,7 +15,7 @@
 #

 DEPTH=..\..\..\..
-MODULE=mime
+MODULE=rawemitter

 ################################################################################
 ## exports
--- a/mailnews/mime/emitters/resources/skin/makefile.win
+++ b/mailnews/mime/emitters/resources/skin/makefile.win
@ -15,7 +15,8 @@
 #

 DEPTH=..\..\..\..\..
-MODULE=xmlemitter
+
+DEFINES=-DWIN32_LEAN_AND_MEAN

 include <$(DEPTH)\config\rules.mak>

--- a/mailnews/mime/emitters/src/makefile.win
+++ b/mailnews/mime/emitters/src/makefile.win
@ -16,7 +16,7 @@
 # Reserved.

 DEPTH=..\..\..\..
-MODULE=mime
+MODULE=mimeemitter

 include <$(DEPTH)\config\config.mak>

--- a/mailnews/mime/emitters/xml/makefile.win
+++ b/mailnews/mime/emitters/xml/makefile.win
@ -22,7 +22,7 @@
 #

 DEPTH=..\..\..\..
-MODULE=mime
+MODULE=xmlemitter

 ################################################################################
 ## exports
--- a/mailnews/mime/resources/makefile.win
+++ b/mailnews/mime/resources/makefile.win
@ -15,7 +15,6 @@
 #

 DEPTH=..\..\..
-MODULE=mime

 DIRS= skin

--- a/mailnews/mime/resources/skin/makefile.win
+++ b/mailnews/mime/resources/skin/makefile.win
@ -15,7 +15,6 @@
 #

 DEPTH=..\..\..\..
-MODULE=mime

 include <$(DEPTH)\config\rules.mak>

--- a/mailnews/mime/tests/xpcomtest/makefile.win
+++ b/mailnews/mime/tests/xpcomtest/makefile.win
@ -20,7 +20,8 @@ IGNORE_MANIFEST = 1
 # New build system where zip dll is build indepenant of java stubs.
 #//
 #//------------------------------------------------------------------------
-MODULE =testmsgfactory
+MODULE = mimetest
+
 #EXPORTS =               \
 #        $(NULL)