General cleanup.

mailnews/imap/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,21 +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 build
+DIRS		= public src resources build
 
 ifdef ENABLE_TESTS
-DIRS += tests
+DIRS		+= tests
 endif
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 

mailnews/imap/build/Makefile.in

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

mailnews/imap/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,35 @@
 # 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		= msgimap
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPIDLSRCS =				  \
-		nsIImapServerSink.idl	\
+MODULE		= msgimap
+
+EXPORTS		= \
+		nsIImapUrl.h \
+		nsIImapProtocol.h \
+		nsIImapLog.h \
+		nsIIMAPHostSessionList.h \
+		nsIImapMailFolderSink.h \
+		nsIImapExtensionSink.h \
+		nsIImapMiscellaneousSink.h \
+		nsIImapService.h \
+		$(NULL)
+
+XPIDLSRCS	= \
+		nsIImapServerSink.idl \
 		nsIImapMessageSink.idl \
 		nsIImapIncomingServer.idl \
 		nsIImapFlagAndUidState.idl \
-		nsIImapMockChannel.idl		\
+		nsIImapMockChannel.idl \
 		$(NULL)
 
-EXPORTS= 								\
-			nsIImapUrl.h				\
-			nsIImapProtocol.h			\
-			nsIImapLog.h				\
-			nsIIMAPHostSessionList.h 	\
-			nsIImapMailFolderSink.h 	\
-			nsIImapExtensionSink.h 		\
-			nsIImapMiscellaneousSink.h 	\
-			nsIImapService.h			\
-			$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 

mailnews/imap/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) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS =  locale
-
-include $(topsrcdir)/config/config.mk
+DIRS		= locale
 
 include $(topsrcdir)/config/rules.mk
 

mailnews/imap/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) 1999 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
 

mailnews/imap/resources/locale/en-US/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,28 +13,17 @@
 # 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
-
 include $(topsrcdir)/config/rules.mk
 
-INSTALL_DIR = $(DIST)/bin/chrome/messenger/locale/en-US
-
-EXPORT_RESOURCE_FILES = \
-	$(srcdir)/imapMsgs_en-US.properties \
-	$(NULL)
-
-EXPORT_RESOURCE_FILES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_FILES))
-
 install::
-	$(INSTALL) $(EXPORT_RESOURCE_FILES) $(INSTALL_DIR)
+	$(INSTALL) $(srcdir)/imapMsgs_en-US.properties $(DIST)/bin/chrome/messenger/locale/en-US
 
-clobber::
-	$(RM) $(EXPORT_RESOURCE_FILES_TO_REMOVE)

mailnews/imap/src/Makefile.in

@@ -17,13 +17,13 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgimap_s
 MODULE		= msgimap
+LIBRARY_NAME	= msgimap_s
 
 EXPORTS		= \
 		nsImapMessage.h \
@@ -67,8 +67,6 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/config.mk
 
-MKSHLIB		:=
-
 # 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=
@@ -76,5 +74,6 @@ override NO_STATIC_LIB=
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+

mailnews/imap/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,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 = harness 
-
-include $(topsrcdir)/config/config.mk
+DIRS		= harness
 
 include $(topsrcdir)/config/rules.mk
 

mailnews/imap/tests/harness/Makefile.in

@@ -17,8 +17,8 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,9 +27,9 @@ PROGRAM		= testimap
 
 CPPSRCS		= imapProtocolTest.cpp
 
-LIBS =	\
-		-L$(DIST)/lib			\
-		-L$(DIST)/bin			\
+LIBS		= \
+		-L$(DIST)/lib \
+		-L$(DIST)/bin \
 		-lxpcom \
 		-lmozjs \
 		-lmsgbaseutil \
@@ -41,6 +41,6 @@ LIBS =	\
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif