From d03bc12900bdd99daacc0c231916d076183106ee Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Tue, 8 Jun 1999 02:22:10 +0000 Subject: [PATCH] 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.) --- db/mdb/public/makefile.win | 6 ++-- mailnews/addrbook/build/makefile.win | 2 +- .../prefs/resources/content/makefile.win | 2 -- mailnews/addrbook/public/makefile.win | 2 +- .../addrbook/resources/content/makefile.win | 2 -- mailnews/addrbook/src/makefile.win | 2 +- .../base/prefs/resources/content/makefile.win | 2 -- .../base/prefs/resources/skin/makefile.win | 2 -- mailnews/base/resources/content/makefile.win | 2 -- mailnews/base/resources/skin/makefile.win | 2 -- mailnews/base/search/public/makefile.win | 4 +-- .../search/resources/content/makefile.win | 3 -- mailnews/base/search/src/makefile.win | 5 ++- mailnews/base/tests/makefile.win | 3 +- mailnews/compose/public/makefile.win | 4 +-- .../compose/resources/content/makefile.win | 2 -- mailnews/compose/tests/compose/makefile.win | 2 +- mailnews/db/mdb/public/makefile.win | 31 ------------------- mailnews/db/msgdb/public/makefile.win | 2 +- mailnews/imap/tests/harness/makefile.win | 2 +- .../mime/cthandlers/resources/makefile.win | 3 -- mailnews/mime/emitters/html/makefile.win | 2 +- mailnews/mime/emitters/raw/makefile.win | 2 +- .../mime/emitters/resources/skin/makefile.win | 3 +- mailnews/mime/emitters/src/makefile.win | 2 +- mailnews/mime/emitters/xml/makefile.win | 2 +- mailnews/mime/resources/makefile.win | 1 - mailnews/mime/resources/skin/makefile.win | 1 - mailnews/mime/tests/xpcomtest/makefile.win | 3 +- 29 files changed, 24 insertions(+), 77 deletions(-) diff --git a/db/mdb/public/makefile.win b/db/mdb/public/makefile.win index d0acb9e3691..ae5b23da8e7 100644 --- 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> diff --git a/mailnews/addrbook/build/makefile.win b/mailnews/addrbook/build/makefile.win index fcfd634d8a0..7c3cde35988 100644 --- a/mailnews/addrbook/build/makefile.win +++ b/mailnews/addrbook/build/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -MODULE=addressbook +MODULE=addrbook ################################################################################ ## exports diff --git a/mailnews/addrbook/prefs/resources/content/makefile.win b/mailnews/addrbook/prefs/resources/content/makefile.win index 9d622b4d148..e6c306d1675 100644 --- 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:: diff --git a/mailnews/addrbook/public/makefile.win b/mailnews/addrbook/public/makefile.win index 5c7e6440cb0..d175de883d3 100644 --- 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 \ diff --git a/mailnews/addrbook/resources/content/makefile.win b/mailnews/addrbook/resources/content/makefile.win index e33ae7e5b86..326c42f4411 100644 --- 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:: diff --git a/mailnews/addrbook/src/makefile.win b/mailnews/addrbook/src/makefile.win index 95bc0153e05..025ffbb3e4e 100644 --- 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> diff --git a/mailnews/base/prefs/resources/content/makefile.win b/mailnews/base/prefs/resources/content/makefile.win index de6a34958de..e1dc5d4b17e 100644 --- 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:: diff --git a/mailnews/base/prefs/resources/skin/makefile.win b/mailnews/base/prefs/resources/skin/makefile.win index 1e064dfe27d..1f129399f3f 100644 --- 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:: diff --git a/mailnews/base/resources/content/makefile.win b/mailnews/base/resources/content/makefile.win index b8fdfb61489..6e4b24a066f 100644 --- 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:: diff --git a/mailnews/base/resources/skin/makefile.win b/mailnews/base/resources/skin/makefile.win index 92467a28004..91ba54385d0 100644 --- 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:: diff --git a/mailnews/base/search/public/makefile.win b/mailnews/base/search/public/makefile.win index 9c80544d244..c855cd80266 100644 --- 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> diff --git a/mailnews/base/search/resources/content/makefile.win b/mailnews/base/search/resources/content/makefile.win index b50af554c6a..a2df4050bff 100644 --- 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:: diff --git a/mailnews/base/search/src/makefile.win b/mailnews/base/search/src/makefile.win index 4ae5a997642..157c9398db7 100644 --- 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\ diff --git a/mailnews/base/tests/makefile.win b/mailnews/base/tests/makefile.win index 4d690a00919..83d33ed4642 100644 --- 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) diff --git a/mailnews/compose/public/makefile.win b/mailnews/compose/public/makefile.win index da6fabedd6c..36aea436fcb 100644 --- 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) ################################################################################ diff --git a/mailnews/compose/resources/content/makefile.win b/mailnews/compose/resources/content/makefile.win index 1e37c971733..1b9d3cb377a 100644 --- 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:: diff --git a/mailnews/compose/tests/compose/makefile.win b/mailnews/compose/tests/compose/makefile.win index f46e6cb6a9c..d01944227f8 100644 --- 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) diff --git a/mailnews/db/mdb/public/makefile.win b/mailnews/db/mdb/public/makefile.win index d0acb9e3691..e69de29bb2d 100644 --- a/mailnews/db/mdb/public/makefile.win +++ b/mailnews/db/mdb/public/makefile.win @@ -1,31 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. - -DEPTH=..\..\..\.. - -MODULE=msgdb - -IDLSRCS = \ - $(NULL) - -EXPORTS = \ - mdb.h \ - $(NULL) - - - -include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/db/msgdb/public/makefile.win b/mailnews/db/msgdb/public/makefile.win index 563796a461f..6f6b2aaed37 100644 --- a/mailnews/db/msgdb/public/makefile.win +++ b/mailnews/db/msgdb/public/makefile.win @@ -18,7 +18,7 @@ DEPTH=..\..\..\.. MODULE=msgdb -IDLSRCS = \ +XPIDLSRCS = \ $(NULL) ################################################################################ diff --git a/mailnews/imap/tests/harness/makefile.win b/mailnews/imap/tests/harness/makefile.win index bb793e8ca91..83d2f63cf0b 100644 --- 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) diff --git a/mailnews/mime/cthandlers/resources/makefile.win b/mailnews/mime/cthandlers/resources/makefile.win index 3e003894a5e..d71f02ba8b7 100644 --- 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:: diff --git a/mailnews/mime/emitters/html/makefile.win b/mailnews/mime/emitters/html/makefile.win index b4017e59ecb..508fc3ee6d3 100644 --- a/mailnews/mime/emitters/html/makefile.win +++ b/mailnews/mime/emitters/html/makefile.win @@ -22,7 +22,7 @@ # DEPTH=..\..\..\.. -MODULE=mime +MODULE=htmlemitter ################################################################################ ## exports diff --git a/mailnews/mime/emitters/raw/makefile.win b/mailnews/mime/emitters/raw/makefile.win index aece12fac70..1eff394336a 100644 --- a/mailnews/mime/emitters/raw/makefile.win +++ b/mailnews/mime/emitters/raw/makefile.win @@ -15,7 +15,7 @@ # DEPTH=..\..\..\.. -MODULE=mime +MODULE=rawemitter ################################################################################ ## exports diff --git a/mailnews/mime/emitters/resources/skin/makefile.win b/mailnews/mime/emitters/resources/skin/makefile.win index 645302afb6b..40aebc2f33b 100644 --- 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> diff --git a/mailnews/mime/emitters/src/makefile.win b/mailnews/mime/emitters/src/makefile.win index 832aabd8981..43b3186c7cf 100644 --- 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> diff --git a/mailnews/mime/emitters/xml/makefile.win b/mailnews/mime/emitters/xml/makefile.win index 28c4e61dc68..9770cbaba84 100644 --- a/mailnews/mime/emitters/xml/makefile.win +++ b/mailnews/mime/emitters/xml/makefile.win @@ -22,7 +22,7 @@ # DEPTH=..\..\..\.. -MODULE=mime +MODULE=xmlemitter ################################################################################ ## exports diff --git a/mailnews/mime/resources/makefile.win b/mailnews/mime/resources/makefile.win index a8bb79abe1a..d810ad6a3b5 100644 --- a/mailnews/mime/resources/makefile.win +++ b/mailnews/mime/resources/makefile.win @@ -15,7 +15,6 @@ # DEPTH=..\..\.. -MODULE=mime DIRS= skin diff --git a/mailnews/mime/resources/skin/makefile.win b/mailnews/mime/resources/skin/makefile.win index 9f947edc79b..838790fd1cd 100644 --- 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> diff --git a/mailnews/mime/tests/xpcomtest/makefile.win b/mailnews/mime/tests/xpcomtest/makefile.win index af01e849a9b..97bd786d80a 100644 --- 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)