giant cleanup of UNIX mail / news Makefiles. properly use MODULE, and

name things so that Windows and UNIX match. (a big checkin for Windows will follow shortly.)
1999-06-08 02:17:24 +00:00 · 1999-06-08 02:17:24 +00:00 · 614b25751b
--- a/db/mdb/public/Makefile.in
+++ b/db/mdb/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= msgmdb

 include $(DEPTH)/config/autoconf.mk

--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = mailnews
+MODULE = msgmork
 LIBRARY_NAME=mork

 EXPORTS = \
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=addressbook
+MODULE=addrbook
 LIBRARY_NAME=addrbook
 IS_COMPONENT=1

@ -36,7 +36,7 @@ EXPORTS= \


 SHARED_LIBRARY_LIBS =	\
-	$(DIST)/lib/libmailnewsaddrbook_s.a	\
+	$(DIST)/lib/libaddrbook_s.a	\
 	$(NULL)

 EXTRA_DSO_LDOPTS = 	\
--- a/mailnews/addrbook/public/Makefile.in
+++ b/mailnews/addrbook/public/Makefile.in
@ -19,7 +19,7 @@ DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
-MODULE		= addressbook
+MODULE		= addrbook

 include $(DEPTH)/config/autoconf.mk
 NO_GEN_XPT=1
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -22,8 +22,8 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=addressbook
-LIBRARY_NAME=mailnewsaddrbook_s
+MODULE=addrbook
+LIBRARY_NAME=addrbook_s

 EXPORTS = \
 	nsAbCard.h \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=mailnews
+MODULE=msgbase
 LIBRARY_NAME=mailnews
 IS_COMPONENT=1
 CPPSRCS= \
@ -34,7 +34,7 @@ EXPORTS = \
 		$(NULL)

 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmailnewsbase_s.a	\
+		$(DIST)/lib/libmsgbase_s.a	\
 		$(DIST)/lib/librdfutil_s.a	\
 		$(NULL)

--- a/mailnews/base/public/Makefile.in
+++ b/mailnews/base/public/Makefile.in
@ -19,7 +19,7 @@ DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
-MODULE		= mailnews
+MODULE		= msgbase

 include $(DEPTH)/config/autoconf.mk
 XPIDLSRCS =				  \
--- a/mailnews/base/search/public/Makefile.in
+++ b/mailnews/base/search/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= msgsearch

 include $(DEPTH)/config/autoconf.mk

@ -33,8 +34,9 @@ EXPORTS= \
 		nsMsgSearchCore.h \
 		$(NULL)

-IDLSRCS = \
+XPIDLSRCS = \
 		$(NULL)
+
 include $(topsrcdir)/config/config.mk

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = search
+MODULE = msgsearch
 LIBRARY_NAME=search_s

 EXPORTS = nsMsgFilterService.h \
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@ -22,8 +22,8 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=mailnewsbase
-LIBRARY_NAME=mailnewsbase_s
+MODULE=msgbase
+LIBRARY_NAME=msgbase_s

 EXPORTS = \
 	nsMessenger.h			\
--- a/mailnews/base/tests/Makefile.in
+++ b/mailnews/base/tests/Makefile.in
@ -20,6 +20,8 @@ topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@

+MODULE =msgbasetest
+
 include $(DEPTH)/config/autoconf.mk

 DIRS = identity accountmanager
--- a/mailnews/compose/public/Makefile.in
+++ b/mailnews/compose/public/Makefile.in
@ -23,9 +23,8 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 MODULE=msgcompose

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

 EXPORTS = \
--- a/mailnews/compose/tests/compose/Makefile.in
+++ b/mailnews/compose/tests/compose/Makefile.in
@ -20,6 +20,8 @@ topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@

+MODULE =msgcomposetest
+
 include $(DEPTH)/config/autoconf.mk

 CPPSRCS = \
--- a/mailnews/db/mdb/public/Makefile.in
+++ b/mailnews/db/mdb/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= msgmdb

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/db/mork/src/Makefile.in
+++ b/mailnews/db/mork/src/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = mailnews
+MODULE = msgmork
 LIBRARY_NAME=mork

 EXPORTS = \
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@ -35,7 +35,7 @@ EXPORTS= \
 	$(NULL)

 SHARED_LIBRARY_LIBS =	\
-	$(DIST)/lib/libmailnewsmsgdb_s.a	\
+	$(DIST)/lib/libmsgdb_s.a	\
 	$(NULL)

 EXTRA_DSO_LDOPTS = 	\
--- a/mailnews/db/msgdb/public/Makefile.in
+++ b/mailnews/db/msgdb/public/Makefile.in
@ -20,6 +20,8 @@ topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@

+MODULE=msgdb
+
 include $(DEPTH)/config/autoconf.mk

 EXPORTS= \
@ -36,8 +38,9 @@ EXPORTS= \
 		nsMsgThread.h \
 		$(NULL)

-IDLSRCS = \
+XPIDLSRCS = \
 		$(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
@ -22,8 +22,8 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = mailnewsmsgdb
-LIBRARY_NAME=mailnewsmsgdb_s
+MODULE = msgdb
+LIBRARY_NAME=msgdb_s

 EXPORTS = \
 	$(NULL)
--- a/mailnews/idl/Makefile.in
+++ b/mailnews/idl/Makefile.in
@ -22,9 +22,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

-
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=imap
+MODULE=msgimap
 LIBRARY_NAME=msgimap
 IS_COMPONENT=1

--- a/mailnews/imap/public/Makefile.in
+++ b/mailnews/imap/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= msgimap

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/imap/tests/harness/Makefile.in
+++ b/mailnews/imap/tests/harness/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= msgimaptest

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=localmail
+MODULE=msglocal
 LIBRARY_NAME=localmail
 IS_COMPONENT=1

@ -36,7 +36,7 @@ EXPORTS= \


 SHARED_LIBRARY_LIBS =	\
-	$(DIST)/lib/liblocalmailbase_s.a	\
+	$(DIST)/lib/libmsglocal_s.a	\
 	$(DIST)/lib/librdfutil_s.a	\
 	$(NULL)

--- a/mailnews/local/public/Makefile.in
+++ b/mailnews/local/public/Makefile.in
@ -20,7 +20,7 @@ topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@

-MODULE=localmail
+MODULE=msglocal

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@ -21,8 +21,8 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=localmailbase
-LIBRARY_NAME=localmailbase_s
+MODULE=msglocal
+LIBRARY_NAME=msglocal_s

 CPPSRCS = \
 	nsPop3Protocol.cpp \
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=nntp
+MODULE=mimeemitter
 LIBRARY_NAME=emitterutil
 # NO_SHARED_LIB=1

--- a/mailnews/mime/public/Makefile.in
+++ b/mailnews/mime/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= mime

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/mime/tests/xpcomtest/Makefile.in
+++ b/mailnews/mime/tests/xpcomtest/Makefile.in
@ -19,6 +19,7 @@ DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+MODULE		= mimetest

 include $(DEPTH)/config/autoconf.mk

--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/config.mk

-MODULE=news
+MODULE=msgnews
 LIBRARY_NAME=msgnews
 IS_COMPONENT=1
 CPPSRCS= \
@ -36,7 +36,7 @@ EXPORTS = \
 		$(NULL)

 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libnntp_s.a	\
+		$(DIST)/lib/libmsgnews_s.a	\
 		$(NULL)

 ifeq ($(OS_ARCH),HP-UX)
--- a/mailnews/news/public/Makefile.in
+++ b/mailnews/news/public/Makefile.in
@ -22,7 +22,7 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=news
+MODULE=msgnews

 XPIDLSRCS= \
 		nsIMsgOfflineNewsState.idl \
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@ -22,8 +22,8 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=news
-LIBRARY_NAME=nntp_s
+MODULE=msgnews
+LIBRARY_NAME=msgnews_s

 EXPORTS = \
 	nsNNTPProtocol.h	\
--- a/mailnews/news/tests/newsParser/Makefile.in
+++ b/mailnews/news/tests/newsParser/Makefile.in
@ -65,7 +65,7 @@ LIBS = \
 	-lgfxps		\
 	-lmozutil \
 	-lmsgbaseutil \
-	$(DIST)/lib/libnntp_s.a	\
+	$(DIST)/lib/libmsgnews_s.a	\
 	$(JPEG_LIBS) \
 	$(PNG_LIBS)  \
 	$(ZLIB_LIBS) \
--- a/mailnews/public/Makefile.in
+++ b/mailnews/public/Makefile.in
@ -19,6 +19,7 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+MODULE		= mailnews

 include $(DEPTH)/config/autoconf.mk

@ -26,7 +27,7 @@ EXPORTS= MailNewsTypes.h\
 		rosetta_mailnews.h\
 		$(NULL)

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