From 4d74b5b41f219e7b8208eb356c654780e5f7c9ab Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Tue, 14 Sep 1999 22:49:58 +0000 Subject: [PATCH] General cleanup. --- mailnews/Makefile.in | 10 +- mailnews/addrbook/Makefile.in | 10 +- mailnews/addrbook/build/Makefile.in | 2 +- mailnews/addrbook/prefs/Makefile.in | 10 +- mailnews/addrbook/prefs/resources/Makefile.in | 10 +- .../prefs/resources/content/Makefile.in | 2 +- .../prefs/resources/locale/Makefile.in | 10 +- .../prefs/resources/locale/en-US/Makefile.in | 10 +- mailnews/addrbook/public/Makefile.in | 37 +++---- mailnews/addrbook/resources/Makefile.in | 10 +- .../addrbook/resources/locale/Makefile.in | 10 +- .../resources/locale/en-US/Makefile.in | 26 ++--- mailnews/addrbook/src/Makefile.in | 77 +++++++------- mailnews/base/Makefile.in | 13 +-- mailnews/base/build/Makefile.in | 6 +- mailnews/base/prefs/Makefile.in | 10 +- mailnews/base/prefs/resources/Makefile.in | 10 +- .../base/prefs/resources/locale/Makefile.in | 10 +- mailnews/base/public/Makefile.in | 86 +++++++-------- mailnews/base/resources/Makefile.in | 10 +- mailnews/base/resources/locale/Makefile.in | 10 +- .../base/resources/locale/en-US/Makefile.in | 24 ++--- mailnews/base/search/Makefile.in | 13 +-- mailnews/base/search/public/Makefile.in | 44 ++++---- mailnews/base/search/resources/Makefile.in | 10 +- .../base/search/resources/locale/Makefile.in | 10 +- mailnews/base/search/src/Makefile.in | 33 +++--- mailnews/base/src/Makefile.in | 100 +++++++++--------- mailnews/base/tests/Makefile.in | 32 +++--- mailnews/base/tests/identity/Makefile.in | 2 +- mailnews/base/util/Makefile.in | 5 +- 31 files changed, 302 insertions(+), 350 deletions(-) diff --git a/mailnews/Makefile.in b/mailnews/Makefile.in index 63234946335..7139a061fbc 100644 --- a/mailnews/Makefile.in +++ b/mailnews/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = .. +DEPTH = .. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = idl public base db news local compose mime imap addrbook - -include $(topsrcdir)/config/config.mk +DIRS = idl public base db news local compose mime imap addrbook include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/Makefile.in b/mailnews/addrbook/Makefile.in index 195ff6b1032..c43d17d18bf 100644 --- a/mailnews/addrbook/Makefile.in +++ b/mailnews/addrbook/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src prefs build resources - -include $(topsrcdir)/config/config.mk +DIRS = public src prefs build resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/build/Makefile.in b/mailnews/addrbook/build/Makefile.in index 0d0b0557ef2..b9375b0e88a 100644 --- a/mailnews/addrbook/build/Makefile.in +++ b/mailnews/addrbook/build/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mailnews/addrbook/prefs/Makefile.in b/mailnews/addrbook/prefs/Makefile.in index 3a7b219c033..a1270939b1d 100644 --- a/mailnews/addrbook/prefs/Makefile.in +++ b/mailnews/addrbook/prefs/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = resources - -include $(topsrcdir)/config/config.mk +DIRS = resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/prefs/resources/Makefile.in b/mailnews/addrbook/prefs/resources/Makefile.in index 30cda1189b2..456c85c5da4 100644 --- a/mailnews/addrbook/prefs/resources/Makefile.in +++ b/mailnews/addrbook/prefs/resources/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale - -include $(topsrcdir)/config/config.mk +DIRS = content locale include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/prefs/resources/content/Makefile.in b/mailnews/addrbook/prefs/resources/content/Makefile.in index f248f31fd10..46a039a29c4 100644 --- a/mailnews/addrbook/prefs/resources/content/Makefile.in +++ b/mailnews/addrbook/prefs/resources/content/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mailnews/addrbook/prefs/resources/locale/Makefile.in b/mailnews/addrbook/prefs/resources/locale/Makefile.in index f60d13c4c5e..9610e63cfc3 100644 --- a/mailnews/addrbook/prefs/resources/locale/Makefile.in +++ b/mailnews/addrbook/prefs/resources/locale/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../../.. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = en-US - -include $(topsrcdir)/config/config.mk +DIRS = en-US include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in b/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in index 4b9dcf9a895..d8a5d1cb15d 100644 --- a/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in +++ b/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in @@ -15,19 +15,15 @@ # Reserved. # -DEPTH = ../../../../../.. +DEPTH = ../../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/pref-addressing.dtd \ - $(NULL) - install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/addressbook/locale/en-US + $(INSTALL) $(srcdir)/pref-addressing.dtd $(DIST)/bin/chrome/addressbook/locale/en-US diff --git a/mailnews/addrbook/public/Makefile.in b/mailnews/addrbook/public/Makefile.in index 31c8a75d548..d74f9a9cba4 100644 --- a/mailnews/addrbook/public/Makefile.in +++ b/mailnews/addrbook/public/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,33 +13,31 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ -MODULE = addrbook +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ - nsIAbListener.idl \ - nsIAbDirectory.idl \ - nsIAbCard.idl \ - nsIAddrDBAnnouncer.idl \ - nsIAddrDBListener.idl \ - nsIAddrDatabase.idl \ - nsIAddressBook.idl \ + +MODULE = addrbook + +XPIDLSRCS = \ + nsIAbListener.idl \ + nsIAbDirectory.idl \ + nsIAbCard.idl \ + nsIAddrDBAnnouncer.idl \ + nsIAddrDBListener.idl \ + nsIAddrDatabase.idl \ + nsIAddressBook.idl \ nsIAbBase.idl \ - nsIAddrBookSession.idl \ + nsIAddrBookSession.idl \ nsIAutoCompleteListener.idl \ - nsIAutoCompleteSession.idl \ - nsIAbAddressCollecter.idl \ + nsIAutoCompleteSession.idl \ + nsIAbAddressCollecter.idl \ $(NULL) -EXPORTS = \ - $(NULL) - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/resources/Makefile.in b/mailnews/addrbook/resources/Makefile.in index 48922f899c1..4e8b83da306 100644 --- a/mailnews/addrbook/resources/Makefile.in +++ b/mailnews/addrbook/resources/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale skin - -include $(topsrcdir)/config/config.mk +DIRS = content locale skin include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/resources/locale/Makefile.in b/mailnews/addrbook/resources/locale/Makefile.in index 357c07a381f..40658a31f4e 100644 --- a/mailnews/addrbook/resources/locale/Makefile.in +++ b/mailnews/addrbook/resources/locale/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = en-US - -include $(topsrcdir)/config/config.mk +DIRS = en-US include $(topsrcdir)/config/rules.mk diff --git a/mailnews/addrbook/resources/locale/en-US/Makefile.in b/mailnews/addrbook/resources/locale/en-US/Makefile.in index dd17b331f4b..3e0c631de8e 100644 --- a/mailnews/addrbook/resources/locale/en-US/Makefile.in +++ b/mailnews/addrbook/resources/locale/en-US/Makefile.in @@ -15,25 +15,25 @@ # Reserved. # -DEPTH = ../../../../.. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/rules.mk - EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/abAddressBookNameDialog.dtd \ - $(srcdir)/abCardOverlay.dtd \ - $(srcdir)/abCardViewOverlay.dtd \ - $(srcdir)/abDirTreeOverlay.dtd \ - $(srcdir)/abMainWindow.dtd \ - $(srcdir)/abNewCardDialog.dtd \ - $(srcdir)/abResultsTreeOverlay.dtd \ - $(srcdir)/abSelectAddressesDialog.dtd \ - $(NULL) + $(srcdir)/abAddressBookNameDialog.dtd \ + $(srcdir)/abCardOverlay.dtd \ + $(srcdir)/abCardViewOverlay.dtd \ + $(srcdir)/abDirTreeOverlay.dtd \ + $(srcdir)/abMainWindow.dtd \ + $(srcdir)/abNewCardDialog.dtd \ + $(srcdir)/abResultsTreeOverlay.dtd \ + $(srcdir)/abSelectAddressesDialog.dtd \ + $(NULL) + +include $(topsrcdir)/config/rules.mk install:: $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/addressbook/locale/en-US diff --git a/mailnews/addrbook/src/Makefile.in b/mailnews/addrbook/src/Makefile.in index a0f6db36d5f..e6ec23b9680 100644 --- a/mailnews/addrbook/src/Makefile.in +++ b/mailnews/addrbook/src/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,50 +13,51 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE=addrbook -LIBRARY_NAME=addrbook_s +MODULE = addrbook +LIBRARY_NAME = addrbook_s -EXPORTS = \ - nsAddressBook.h\ - nsAddrBookSession.h\ - nsAbRDFDataSource.h\ - nsAbRDFResource.h\ - nsCardDataSource.h \ - nsDirectoryDataSource.h \ - nsAbCard.h \ - nsAbDirectory.h \ - nsAbCardProperty.h\ - nsDirPrefs.h \ - nsAddrDatabase.h\ - nsAbDirProperty.h\ - nsAbAutoCompleteSession.h\ - nsAbAddressCollecter.h\ - $(NULL) +CPPSRCS = \ + nsAddressBook.cpp \ + nsAddrBookSession.cpp \ + nsAbRDFDataSource.cpp \ + nsAbRDFResource.cpp \ + nsCardDataSource.cpp \ + nsDirectoryDataSource.cpp \ + nsAbCard.cpp \ + nsAbDirectory.cpp \ + nsAbCardProperty.cpp \ + nsDirPrefs.cpp \ + nsAddrDatabase.cpp \ + nsAbDirProperty.cpp \ + nsAbAutoCompleteSession.cpp \ + nsAbAddressCollecter.cpp \ + $(NULL) -CPPSRCS = \ - nsAddressBook.cpp\ - nsAddrBookSession.cpp\ - nsAbRDFDataSource.cpp\ - nsAbRDFResource.cpp\ - nsCardDataSource.cpp \ - nsDirectoryDataSource.cpp \ - nsAbCard.cpp \ - nsAbDirectory.cpp \ - nsAbCardProperty.cpp\ - nsDirPrefs.cpp \ - nsAddrDatabase.cpp\ - nsAbDirProperty.cpp\ - nsAbAutoCompleteSession.cpp\ - nsAbAddressCollecter.cpp\ - $(NULL) +EXPORTS = \ + nsAddressBook.h \ + nsAddrBookSession.h \ + nsAbRDFDataSource.h \ + nsAbRDFResource.h \ + nsCardDataSource.h \ + nsDirectoryDataSource.h \ + nsAbCard.h \ + nsAbDirectory.h \ + nsAbCardProperty.h \ + nsDirPrefs.h \ + nsAddrDatabase.h \ + nsAbDirProperty.h \ + nsAbAutoCompleteSession.h \ + nsAbAddressCollecter.h \ + $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 @@ -66,5 +66,6 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH), Linux) -DEFINES += -D_BSD_SOURCE +DEFINES += -D_BSD_SOURCE endif + diff --git a/mailnews/base/Makefile.in b/mailnews/base/Makefile.in index a75d27b11a3..ac1a68b4430 100644 --- a/mailnews/base/Makefile.in +++ b/mailnews/base/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,22 +13,20 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src util search prefs build resources +DIRS = public src util search prefs build resources ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests endif - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/build/Makefile.in b/mailnews/base/build/Makefile.in index 8c83941ffc2..f61dd4db523 100644 --- a/mailnews/base/build/Makefile.in +++ b/mailnews/base/build/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -40,9 +40,9 @@ EXTRA_DSO_LDOPTS = \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ - -L$(DIST)/lib \ + -L$(DIST)/lib \ -lxpcom \ - $(MOZ_TIMER_LIBS) \ + $(MOZ_TIMER_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mailnews/base/prefs/Makefile.in b/mailnews/base/prefs/Makefile.in index 3a7b219c033..a1270939b1d 100644 --- a/mailnews/base/prefs/Makefile.in +++ b/mailnews/base/prefs/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = resources - -include $(topsrcdir)/config/config.mk +DIRS = resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/prefs/resources/Makefile.in b/mailnews/base/prefs/resources/Makefile.in index 92619c174a9..e4a4e38b1c2 100644 --- a/mailnews/base/prefs/resources/Makefile.in +++ b/mailnews/base/prefs/resources/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale skin - -include $(topsrcdir)/config/config.mk +DIRS = content locale skin include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/prefs/resources/locale/Makefile.in b/mailnews/base/prefs/resources/locale/Makefile.in index f60d13c4c5e..9610e63cfc3 100644 --- a/mailnews/base/prefs/resources/locale/Makefile.in +++ b/mailnews/base/prefs/resources/locale/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../../.. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = en-US - -include $(topsrcdir)/config/config.mk +DIRS = en-US include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/public/Makefile.in b/mailnews/base/public/Makefile.in index a1ab0142aa0..9c81fe171cc 100644 --- a/mailnews/base/public/Makefile.in +++ b/mailnews/base/public/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,58 +13,59 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ -MODULE = msgbase +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ - nsICopyMessageListener.idl \ + +MODULE = msgbase + +EXPORTS = \ + msgCore.h \ + nsIMsgHdr.h \ + nsMsgFolderFlags.h \ + nsMsgHeaderMasks.h \ + nsMsgMessageFlags.h \ + nsMsgLocalFolderHdrs.h \ + nsMsgMD5.h \ + $(NULL) + +XPIDLSRCS = \ + nsICopyMessageListener.idl \ nsICopyMsgStreamListener.idl \ - nsIMessenger.idl \ - nsIFolder.idl \ - nsIFolderListener.idl \ - nsIMessage.idl \ - nsIMessageView.idl \ - nsIMsgAccount.idl \ - nsIMsgAccountManager.idl \ - nsIMsgFolder.idl \ - nsIMsgFolderCache.idl \ - nsIMsgFolderCacheElement.idl \ - nsIMsgGroupRecord.idl \ - nsIMsgHost.idl \ - nsIMsgIdentity.idl \ - nsIMsgIncomingServer.idl \ - nsIMsgMailSession.idl \ + nsIMessenger.idl \ + nsIFolder.idl \ + nsIFolderListener.idl \ + nsIMessage.idl \ + nsIMessageView.idl \ + nsIMsgAccount.idl \ + nsIMsgAccountManager.idl \ + nsIMsgFolder.idl \ + nsIMsgFolderCache.idl \ + nsIMsgFolderCacheElement.idl \ + nsIMsgGroupRecord.idl \ + nsIMsgHost.idl \ + nsIMsgIdentity.idl \ + nsIMsgIncomingServer.idl \ + nsIMsgMailSession.idl \ nsIMsgMessageService.idl \ - nsIMsgSignature.idl \ - nsIMsgThread.idl \ - nsIMsgVCard.idl \ - nsIUrlListener.idl \ + nsIMsgSignature.idl \ + nsIMsgThread.idl \ + nsIMsgVCard.idl \ + nsIUrlListener.idl \ nsIUrlListenerManager.idl \ - nsIMsgBiffManager.idl \ - nsIMsgCopyService.idl \ - nsIMsgCopyServiceListener.idl \ + nsIMsgBiffManager.idl \ + nsIMsgCopyService.idl \ + nsIMsgCopyServiceListener.idl \ nsIMsgStatusFeedback.idl \ - nsIMsgMailNewsUrl.idl \ - nsIMsgWindowData.idl \ - nsIMsgProtocolInfo.idl \ + nsIMsgMailNewsUrl.idl \ + nsIMsgWindowData.idl \ + nsIMsgProtocolInfo.idl \ $(NULL) -EXPORTS = \ - msgCore.h \ - nsIMsgHdr.h \ - nsMsgFolderFlags.h \ - nsMsgHeaderMasks.h \ - nsMsgMessageFlags.h \ - nsMsgLocalFolderHdrs.h \ - nsMsgMD5.h \ - $(NULL) - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/resources/Makefile.in b/mailnews/base/resources/Makefile.in index aad43e81701..683de7f38b3 100644 --- a/mailnews/base/resources/Makefile.in +++ b/mailnews/base/resources/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content skin locale - -include $(topsrcdir)/config/config.mk +DIRS = content skin locale include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/resources/locale/Makefile.in b/mailnews/base/resources/locale/Makefile.in index 357c07a381f..40658a31f4e 100644 --- a/mailnews/base/resources/locale/Makefile.in +++ b/mailnews/base/resources/locale/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = en-US - -include $(topsrcdir)/config/config.mk +DIRS = en-US include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/resources/locale/en-US/Makefile.in b/mailnews/base/resources/locale/en-US/Makefile.in index a090a6e0051..bb264ffe042 100644 --- a/mailnews/base/resources/locale/en-US/Makefile.in +++ b/mailnews/base/resources/locale/en-US/Makefile.in @@ -15,24 +15,24 @@ # Reserved. # -DEPTH = ../../../../.. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/rules.mk - EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/messenger.dtd \ - $(srcdir)/threadpane.dtd \ - $(srcdir)/folderpane.dtd \ - $(srcdir)/newFolderNameDialog.dtd \ - $(srcdir)/subscribe.dtd \ - $(srcdir)/sidebar-messenger.dtd \ - $(srcdir)/sidebar-messenger-rdf.dtd \ - $(NULL) + $(srcdir)/messenger.dtd \ + $(srcdir)/threadpane.dtd \ + $(srcdir)/folderpane.dtd \ + $(srcdir)/newFolderNameDialog.dtd \ + $(srcdir)/subscribe.dtd \ + $(srcdir)/sidebar-messenger.dtd \ + $(srcdir)/sidebar-messenger-rdf.dtd \ + $(NULL) + +include $(topsrcdir)/config/rules.mk install:: $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/messenger/locale/en-US diff --git a/mailnews/base/search/Makefile.in b/mailnews/base/search/Makefile.in index 9656a97645c..52cff42149f 100644 --- a/mailnews/base/search/Makefile.in +++ b/mailnews/base/search/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,22 +13,20 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src resources -#xxx Need to write tests/Makefile.in #ifdef ENABLE_TESTS -#DIRS += tests +#DIRS += tests #endif -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/search/public/Makefile.in b/mailnews/base/search/public/Makefile.in index efe81592e5e..d8e6b3262ab 100644 --- a/mailnews/base/search/public/Makefile.in +++ b/mailnews/base/search/public/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,36 +13,37 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1999 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ -MODULE = msgsearch +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ - nsIMsgFilter.idl \ - nsIMsgFilterHitNotify.idl \ - nsIMsgFilterList.idl \ - nsIMsgFilterService.idl \ - nsIMsgSearchAdapter.idl \ - nsIMsgSearchSession.idl \ - nsMsgFilterCore.idl \ - nsMsgSearchCore.idl \ - $(NULL) -EXPORTS= \ - nsMsgBodyHandler.h \ - nsMsgResultElement.h \ - nsMsgSearchArray.h \ - nsMsgSearchBoolExpression.h \ - nsMsgSearchScopeTerm.h \ - nsMsgSearchTerm.h \ +MODULE = msgsearch + +EXPORTS = \ + nsMsgBodyHandler.h \ + nsMsgResultElement.h \ + nsMsgSearchArray.h \ + nsMsgSearchBoolExpression.h \ + nsMsgSearchScopeTerm.h \ + nsMsgSearchTerm.h \ nsMsgSearchAdapter.h \ $(NULL) -include $(topsrcdir)/config/config.mk +XPIDLSRCS = \ + nsIMsgFilter.idl \ + nsIMsgFilterHitNotify.idl \ + nsIMsgFilterList.idl \ + nsIMsgFilterService.idl \ + nsIMsgSearchAdapter.idl \ + nsIMsgSearchSession.idl \ + nsMsgFilterCore.idl \ + nsMsgSearchCore.idl \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/search/resources/Makefile.in b/mailnews/base/search/resources/Makefile.in index 30cda1189b2..456c85c5da4 100644 --- a/mailnews/base/search/resources/Makefile.in +++ b/mailnews/base/search/resources/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale - -include $(topsrcdir)/config/config.mk +DIRS = content locale include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/search/resources/locale/Makefile.in b/mailnews/base/search/resources/locale/Makefile.in index 894f149ecb2..9610e63cfc3 100644 --- a/mailnews/base/search/resources/locale/Makefile.in +++ b/mailnews/base/search/resources/locale/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,16 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../../.. +DEPTH = ../../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk - -DIRS = en-US +DIRS = en-US include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/search/src/Makefile.in b/mailnews/base/search/src/Makefile.in index fb2d83797bb..49158571941 100644 --- a/mailnews/base/search/src/Makefile.in +++ b/mailnews/base/search/src/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,35 +13,33 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE=msgsearch -LIBRARY_NAME=msgsearch_s +MODULE = msgsearch +LIBRARY_NAME = msgsearch_s -EXPORTS = nsMsgFilterService.h \ - $(NULL) +CPPSRCS = \ + nsMsgFilterService.cpp \ + nsMsgFilterList.cpp \ + nsMsgFilter.cpp \ + nsMsgSearchTerm.cpp \ + nsMsgBodyHandler.cpp \ + nsMsgLocalSearch.cpp \ + nsMsgSearchAdapter.cpp \ + $(NULL) -CPPSRCS = \ - nsMsgFilterService.cpp\ - nsMsgFilterList.cpp\ - nsMsgFilter.cpp\ - nsMsgSearchTerm.cpp\ - nsMsgBodyHandler.cpp\ - nsMsgLocalSearch.cpp\ - nsMsgSearchAdapter.cpp\ - $(NULL) +EXPORTS = nsMsgFilterService.h # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 override NO_STATIC_LIB= -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in index e55efe0fa35..96bc80ef2c0 100644 --- a/mailnews/base/src/Makefile.in +++ b/mailnews/base/src/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,63 +13,64 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE=msgbase -LIBRARY_NAME=msgbase_s +MODULE = msgbase +LIBRARY_NAME = msgbase_s -EXPORTS = \ - nsMessenger.h \ - nsMessengerBootstrap.h \ - nsMsgKeyArray.h \ - nsUrlListenerManager.h \ - nsMsgMailSession.h \ - nsMsgAccountManager.h \ - nsMsgAccount.h \ - nsMsgFolderDataSource.h \ - nsMsgFolderCache.h \ - nsMsgMessageDataSource.h \ - nsMessageViewDataSource.h \ - nsMsgAccountManagerDS.h \ - nsMsgRDFDataSource.h \ - nsMsgBiffManager.h \ - nsMsgNotificationManager.h \ - nsCopyMessageStreamListener.h \ - nsMsgCopyService.h \ - nsMsgStatusFeedback.h \ - nsMessageView.h \ - $(NULL) +CPPSRCS = \ + nsMessenger.cpp \ + nsMessengerBootstrap.cpp \ + nsMsgKeyArray.cpp \ + nsUrlListenerManager.cpp \ + nsMsgMailSession.cpp \ + nsMsgMD5.cpp \ + nsMsgAccountManager.cpp \ + nsMsgAccount.cpp \ + nsCopyMessageStreamListener.cpp \ + nsMsgRDFDataSource.cpp \ + nsMsgFolderDataSource.cpp \ + nsMsgMessageDataSource.cpp \ + nsMessageViewDataSource.cpp \ + nsMsgAccountManagerDS.cpp \ + nsMsgRDFUtils.cpp \ + nsMsgBiffManager.cpp \ + nsMsgNotificationManager.cpp \ + nsMsgCopyService.cpp \ + nsMsgFolderCache.cpp \ + nsMsgFolderCacheElement.cpp \ + nsMsgStatusFeedback.cpp \ + nsMessageView.cpp \ + $(NULL) -CPPSRCS = \ - nsMessenger.cpp \ - nsMessengerBootstrap.cpp \ - nsMsgKeyArray.cpp \ - nsUrlListenerManager.cpp \ - nsMsgMailSession.cpp \ - nsMsgMD5.cpp \ - nsMsgAccountManager.cpp \ - nsMsgAccount.cpp \ - nsCopyMessageStreamListener.cpp \ - nsMsgRDFDataSource.cpp \ - nsMsgFolderDataSource.cpp \ - nsMsgMessageDataSource.cpp \ - nsMessageViewDataSource.cpp \ - nsMsgAccountManagerDS.cpp \ - nsMsgRDFUtils.cpp \ - nsMsgBiffManager.cpp \ - nsMsgNotificationManager.cpp \ - nsMsgCopyService.cpp \ - nsMsgFolderCache.cpp \ - nsMsgFolderCacheElement.cpp \ - nsMsgStatusFeedback.cpp \ - nsMessageView.cpp \ - $(NULL) +EXPORTS = \ + nsMessenger.h \ + nsMessengerBootstrap.h \ + nsMsgKeyArray.h \ + nsUrlListenerManager.h \ + nsMsgMailSession.h \ + nsMsgAccountManager.h \ + nsMsgAccount.h \ + nsMsgFolderDataSource.h \ + nsMsgFolderCache.h \ + nsMsgMessageDataSource.h \ + nsMessageViewDataSource.h \ + nsMsgAccountManagerDS.h \ + nsMsgRDFDataSource.h \ + nsMsgBiffManager.h \ + nsMsgNotificationManager.h \ + nsCopyMessageStreamListener.h \ + nsMsgCopyService.h \ + nsMsgStatusFeedback.h \ + nsMessageView.h \ + $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 diff --git a/mailnews/base/tests/Makefile.in b/mailnews/base/tests/Makefile.in index 98f4050c7b2..efd243e057d 100644 --- a/mailnews/base/tests/Makefile.in +++ b/mailnews/base/tests/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,33 +13,28 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ - -MODULE =msgbasetest +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = identity accountmanager +MODULE = msgbasetest +PROGRAM = testmailnews -PROGRAM = testmailnews +DIRS = identity accountmanager -CPPSRCS = \ - test.cpp \ +CPPSRCS = test.cpp + +LIBS = \ + -L$(DIST)/lib \ + -L$(DIST)/bin \ + $(NSPR_LIBS) \ + -lxpcom \ $(NULL) -LIBS = \ - -L$(DIST)/lib \ - -L$(DIST)/bin \ - $(NSPR_LIBS) \ - -lxpcom \ - $(NULL) - - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/base/tests/identity/Makefile.in b/mailnews/base/tests/identity/Makefile.in index 4122c89d3c2..8f00b1b12bd 100644 --- a/mailnews/base/tests/identity/Makefile.in +++ b/mailnews/base/tests/identity/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mailnews/base/util/Makefile.in b/mailnews/base/util/Makefile.in index 2786a717402..a7dadc7ee65 100644 --- a/mailnews/base/util/Makefile.in +++ b/mailnews/base/util/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -72,5 +72,6 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH), Linux) -DEFINES += -D_BSD_SOURCE +DEFINES += -D_BSD_SOURCE endif +