General cleanup.

1999-09-14 23:19:19 +00:00 · 1999-09-14 23:19:19 +00:00 · 26b04895f8
--- a/mailnews/db/Makefile.in
+++ b/mailnews/db/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 = msgdb
-
-include $(topsrcdir)/config/config.mk
+DIRS		= msgdb

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/db/mdb/Makefile.in
+++ b/mailnews/db/mdb/Makefile.in
@ -1,35 +0,0 @@
-#!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
-# 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 = ../../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-# no src yet, or tests or build
-DIRS = public
-
-ifdef ENABLE_TESTS
-# DIRS += tests
-endif
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/mdb/public/Makefile.in
+++ b/mailnews/db/mdb/public/Makefile.in
@ -1,33 +0,0 @@
-#!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
-# 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) 1999 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH = ../../../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-MODULE		= msgmdb
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORTS= \
-		mdb.h \
-		$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/mork/Makefile.in
+++ b/mailnews/db/mork/Makefile.in
@ -1,34 +0,0 @@
-#!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
-# 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 = ../../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = src build
-
-#ifdef ENABLE_TESTS
-#DIRS += tests
-#endif
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/mork/build/Makefile.in
+++ b/mailnews/db/mork/build/Makefile.in
@ -1,52 +0,0 @@
-#
-# 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		= ../../../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mork
-LIBRARY_NAME	= mork
-IS_COMPONENT	= 1
-
-CPPSRCS		= nsMorkFactory.cpp
-
-EXPORTS		= \
-		nsMorkCID.h \
-		nsIMdbFactoryFactory.h \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.a
-
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		-lxpcom \
-		-lmsgbaseutil \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-
--- a/mailnews/db/mork/src/Makefile.in
+++ b/mailnews/db/mork/src/Makefile.in
@ -1,101 +0,0 @@
-#!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
-# 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 = ../../../..
-topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = msgmork
-LIBRARY_NAME=msgmork_s
-
-EXPORTS = \
-	$(NULL)
-
-CPPSRCS = \
-	orkinCell.cpp\
-	orkinCompare.cpp\
-	orkinEnv.cpp\
-	orkinFactory.cpp\
-	orkinFile.cpp\
-	orkinHeap.cpp\
-	orkinPortTableCursor.cpp\
-	orkinRow.cpp\
-	orkinRowCellCursor.cpp\
-	orkinSorting.cpp\
-	orkinStore.cpp\
-	orkinTable.cpp\
-	orkinTableRowCursor.cpp\
-	orkinThumb.cpp\
-	morkArray.cpp\
-	morkAtom.cpp\
-	morkAtomMap.cpp\
-	morkAtomSpace.cpp\
-	morkBlob.cpp\
-	morkBuilder.cpp\
-	morkCell.cpp\
-	morkCellObject.cpp\
-	morkCh.cpp\
-	morkConfig.cpp\
-	morkCursor.cpp \
-	morkDeque.cpp\
-	morkEnv.cpp\
-	morkFactory.cpp\
-	morkFile.cpp\
-	morkHandle.cpp\
-	morkIntMap.cpp\
-	morkMap.cpp\
-	morkNode.cpp\
-	morkNodeMap.cpp\
-	morkObject.cpp\
-	morkParser.cpp\
-	morkPool.cpp\
-	morkQuickSort.cpp\
-	morkRow.cpp\
-	morkRowCellCursor.cpp\
-	morkRowMap.cpp\
-	morkRowObject.cpp\
-	morkRowSpace.cpp\
-	morkSink.cpp\
-	morkSorting.cpp\
-	morkSortingRowCursor.cpp\
-	morkSpace.cpp\
-	morkStore.cpp\
-	morkStream.cpp\
-	morkTable.cpp\
-	morkPortTableCursor.cpp\
-	morkTableRowCursor.cpp\
-	morkThumb.cpp\
-	morkWriter.cpp\
-	morkYarn.cpp\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	$(NSPR_LIBS)	\
-	$(NULL)
-
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/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,16 +13,15 @@
 # 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 build
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src build

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@ -17,8 +17,8 @@

 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

@ -45,7 +45,7 @@ EXTRA_DSO_LDOPTS = \
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif

 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
--- a/mailnews/db/msgdb/public/Makefile.in
+++ b/mailnews/db/msgdb/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,35 +13,34 @@
 # 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=msgdb
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORTS= \
+MODULE		= msgdb
+
+EXPORTS		= \
 		nsMsgHdr.h \
 		nsINewsDatabase.h \
 		nsMsgDatabase.h \
-		nsMailDatabase.h				\
-		nsImapMailDatabase.h				\
-		nsNewsDatabase.h				\
-		nsDBFolderInfo.h	    \
+		nsMailDatabase.h \
+		nsImapMailDatabase.h \
+		nsNewsDatabase.h \
+		nsDBFolderInfo.h \
 		nsMsgThread.h \
 		$(NULL)

-XPIDLSRCS = \
+XPIDLSRCS	= \
 		nsIDBFolderInfo.idl \
-		nsIDBChangeListener.idl		\
-		nsIDBChangeAnnouncer.idl		\
-		nsIMsgDatabase.idl		\
+		nsIDBChangeListener.idl \
+		nsIDBChangeAnnouncer.idl \
+		nsIMsgDatabase.idl \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@ -17,8 +17,8 @@

 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

@ -42,5 +42,6 @@ override NO_STATIC_LIB=
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+
--- a/mailnews/idl/Makefile.in
+++ b/mailnews/idl/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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@ -23,7 +23,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 # MailNewsTypes.idl:  not yet.  talk to alecf
-XPIDLSRCS = \
-		$(NULL)
+#XPIDLSRCS	=

 include $(topsrcdir)/config/rules.mk
+