git-svn-id: svn://10.0.0.236/trunk@9433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org 1998-09-05 10:25:13 +00:00
parent ac435378f8
commit 36caf9e033
7 changed files with 255 additions and 115 deletions

View File

@ -94,7 +94,6 @@ REQUIRES =\
js \
libfont \
mariner \
msg \
plds \
nspr20 \
parse \
@ -118,6 +117,18 @@ REQUIRES += \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
REQUIRES += \
msg \
$(NULL)
else
ifdef MOZ_MAIL_COMPOSE
REQUIRES += \
mailto \
$(NULL)
endif
endif
REQUIRES += \
xfeicons \
progress \
@ -180,6 +191,13 @@ CSRCS += \
mailcompose.c \
movemail.c \
$(NULL)
else
ifdef MOZ_MAIL_COMPOSE
CSRCS += \
mailattach.c \
mailcompose.c \
$(NULL)
endif
endif
ifndef NO_UNIX_ASYNC_DNS
@ -251,9 +269,12 @@ ifeq ($(OS_ARCH),AIX)
NSPR_LIB =
else
# XXX To a DSO...
#NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libmsgc21.a $(DIST)/lib/libnspr21.a
ifdef FULL_STATIC_BUILD
NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libmsgc21.a $(DIST)/lib/libnspr21.a
else
BASIC_DSOS += -lplds21 -lplc21 -lmsgc21 -lnspr21
endif
endif
ifdef DBMALLOC
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
@ -361,9 +382,17 @@ endif
BASIC_LIBS_2 += \
$(DIST)/lib/libldap.a \
$(NULL)
endif
# Do we need libns_mime.a here if MOZ_MAIL_COMPOSE and MOZ_SECURITY?
#ifdef MOZ_MAIL_COMPOSE
#ifdef MOZ_SECURITY
#BASIC_LIBS += \
# $(DIST)/lib/libns_mime.a \
# $(NULL)
#endif
#endif
BASIC_LIBS += \
$(DIST)/lib/libmisc.a \
$(DIST)/lib/libprgrss.a \
@ -390,6 +419,13 @@ BASIC_LIBS += $(DIST)/lib/libaddr.a \
$(NULL)
endif
ifdef MOZ_MAIL_COMPOSE
BASIC_LIBS += $(DIST)/lib/libmailto.a \
$(DIST)/lib/libmime.a \
$(DIST)/lib/libsmtpurl.a \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
BASIC_LIBS += $(DIST)/lib/libnntpurl.a \
$(DIST)/lib/libsmtpurl.a \
@ -452,6 +488,7 @@ BASIC_LIBS += \
$(DIST)/lib/libzpw.a \
$(DIST)/lib/libiawt.a \
$(DIST)/lib/libmmedia.a \
$(DIST)/lib/libsoftupdate.a \
$(DIST)/lib/libprgrss.a \
$(DIST)/lib/libcon.a \
$(DIST)/lib/libjbn.a \
@ -482,6 +519,7 @@ ifdef NSJVM
ifdef EDITOR
BASIC_LIBS += $(DIST)/lib/libedtplug.a
endif
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a
else # !NSJVM
BASIC_LIBS += \
$(DIST)/lib/libstubsj.a \
@ -503,27 +541,30 @@ BASIC_LIBS += \
endif # !MOZ_OJI
endif # !MOZ_JAVA
ifdef MOZ_SMARTUPDATE
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \
$(DIST)/lib/libprgrss.a \
$(NULL)
endif
ifdef MOZ_NATIVE_ZLIB
BASIC_LIBS += -lz
else
# XXX To a DSO...
#BASIC_LIBS += $(DIST)/lib/libzlib.a
ifdef FULL_STATIC_BUILD
BASIC_LIBS += $(DIST)/lib/libzlib.a
else
BASIC_DSOS += -lzlib
endif
endif
ifndef NO_MOCHA
# XXX To a DSO...
#BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a
ifdef FULL_STATIC_BUILD
BASIC_LIBS += $(DIST)/lib/libjs.a
ifdef JAVA_OR_OJI
BASIC_LIBS += $(DIST)/lib/libjsj.a
endif
else
BASIC_DSOS += -ljs
ifdef JAVA_OR_OJI
BASIC_DSOS += -ljsj
endif
endif
BASIC_LIBS += $(DIST)/lib/libmocha.a
ifdef DOM
# the DOM code calls back into layout.
@ -614,10 +655,14 @@ DEFINES += -DUSE_WINNING_FILE_SELECTION
endif
INCLUDES += -I$(srcdir)/src -I$(srcdir)/. -I$(DEPTH)/dist/public/nls -I$(DEPTH)/dist/public/security \
-I$(DEPTH)/lib/libmsg -I$(DEPTH)/dist/public/ldap \
-I$(DEPTH)/dist/public/ldap \
-I$(DEPTH)/modules/libimg/public \
-I$(DEPTH)/l10n/us -I$(topsrcdir)/l10n/us
ifdef MOZ_MAIL_NEWS
INCLUDES += -I$(srcdir)/src -I$(srcdir)/. -I$(topsrcdir)/lib/libmsg
endif
#######################################################################
#

View File

@ -62,7 +62,6 @@ REQUIRES =\
plugimpl \
raptor \
netcnvts \
msg \
progress \
privacy
@ -71,11 +70,20 @@ REQUIRES += oji \
ojiimpl
endif
ifdef MOZ_MAIL_NEWS
REQUIRES += msg
else
ifdef MOZ_MAIL_COMPOSE
REQUIRES += mailto
endif
endif
CPPSRCS = \
plugin.cpp \
BackForwardMenu.cpp \
BookmarkFrame.cpp \
BookmarkMenu.cpp \
BuiltinTreeView.cpp \
Button.cpp \
BrowserDrop.cpp \
BrowserFrame.cpp \
@ -148,6 +156,33 @@ CPPSRCS += \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
MAIL_OR_COMPOSE = 1
endif
ifdef MOZ_MAIL_COMPOSE
MAIL_OR_COMPOSE = 1
endif
ifdef MAIL_OR_COMPOSE
CPPSRCS += \
AddressFolderView.cpp \
AddressOutliner.cpp \
AttachPanel.cpp \
AttachmentMenu.cpp \
ComposeAttachDialog.cpp \
ComposeAttachFolderView.cpp \
ComposeFolderView.cpp \
ComposeFrame.cpp \
ComposeView.cpp \
MNView.cpp \
MNListView.cpp \
OptionFolderView.cpp \
ProgressFrame.cpp \
TabView.cpp \
TextEditorView.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
ABComplPickerDlg.cpp \
@ -170,57 +205,16 @@ CPPSRCS += \
ABNameGenTab.cpp \
AddrBookFrame.cpp \
AddrBookView.cpp \
AddressFolderView.cpp \
AddressOutliner.cpp \
AdvSearchDialog.cpp \
AttachPanel.cpp \
AttachmentMenu.cpp \
ComposeAttachDialog.cpp \
ComposeAttachFolderView.cpp \
ComposeFolderView.cpp \
ComposeFrame.cpp \
ComposeView.cpp \
EditHdrDialog.cpp \
$(NULL)
endif
ifdef EDITOR
CPPSRCS += \
EditorDrop.cpp \
EditorFrame.cpp \
EditorToolbar.cpp \
EditorView.cpp \
EditRecentMenu.cpp \
EditTableDialog.cpp \
EmbeddedEditorView.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
FolderDropdown.cpp \
FolderFrame.cpp \
FolderPromptDialog.cpp \
FolderMenu.cpp \
FolderView.cpp \
$(NULL)
endif
ifdef MOZ_LDAP
CPPSRCS += \
LdapSearchFrame.cpp \
LdapSearchView.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
MNBanner.cpp \
MNListView.cpp \
MNSearchFrame.cpp \
MNSearchView.cpp \
MNView.cpp \
MailDownloadFrame.cpp \
MailFilterDlg.cpp \
MailFilterRulesDlg.cpp \
@ -233,37 +227,18 @@ CPPSRCS += \
NewsServerDialog.cpp \
NewsServerPropDialog.cpp \
NewsgroupPropDialog.cpp \
OptionFolderView.cpp \
PrefsDialogMServer.cpp \
PrefsDialogNServer.cpp \
PrefsMailFolderDlg.cpp \
PrefsPageAddress.cpp \
PrefsPageMessages.cpp \
PrefsPageNServer.cpp \
ProgressFrame.cpp \
SubUpgradeDialog.cpp \
TabView.cpp \
XmLFolderDialog.cpp \
XmLFolderView.cpp \
ViewDashBDlg.cpp \
$(NULL)
endif
ifdef EDITOR
CPPSRCS += \
PrefsDialogEditor.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
PropertySheetDialog.cpp \
PropertySheetView.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
ReadAttachDrag.cpp \
ReadAttachPanel.cpp \
SearchRuleView.cpp \
@ -273,34 +248,6 @@ CPPSRCS += \
SubTabView.cpp \
SubscribeDialog.cpp \
SubscribeView.cpp \
$(NULL)
endif
ifdef MOZ_TASKBAR
CPPSRCS += \
TaskBar.cpp \
TaskBarDrop.cpp \
$(NULL)
DEFINES += -DMOZ_TASKBAR
endif
ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
DEFINES += -DXFE_PREF_ADVANCED_PASSIVE_FTP
endif
ifdef XFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
DEFINES += -DXFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
TextEditorView.cpp \
$(NULL)
endif
ifdef MOZ_MAIL_NEWS
CPPSRCS += \
ThreadFrame.cpp \
ThreadView.cpp \
$(NULL)
@ -314,8 +261,44 @@ endif
ifdef EDITOR
CPPSRCS += \
EditorDrop.cpp \
EditorFrame.cpp \
EditorToolbar.cpp \
EditorView.cpp \
EditRecentMenu.cpp \
EditTableDialog.cpp \
EmbeddedEditorView.cpp \
PrefsDialogEditor.cpp \
SpellHandler.cpp \
$(NULL)
$(NULL)
endif
ifdef MOZ_LDAP
CPPSRCS += \
LdapSearchFrame.cpp \
LdapSearchView.cpp \
$(NULL)
endif
ifdef MOZ_TASKBAR
CPPSRCS += \
TaskBar.cpp \
TaskBarDrop.cpp \
$(NULL)
DEFINES += -DMOZ_TASKBAR
endif
ifdef MOZ_SELECTOR_BAR
DEFINES += -DMOZ_SELECTOR_BAR
endif
ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
DEFINES += -DXFE_PREF_ADVANCED_PASSIVE_FTP
endif
ifdef XFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
DEFINES += -DXFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
endif
CSRCS = commands.c
@ -323,11 +306,11 @@ CSRCS = commands.c
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(OBJDIR) -I$(srcdir)/.. -I$(srcdir)/../DtWidgets -I$(topsrcdir)/modules/libreg/include \
-I$(topsrcdir)/lib/libmsg -I$(DEPTH)/dist/public/security -I$(DEPTH)/dist/public/ldap
-I$(DEPTH)/dist/public/security
#ifdef MOZ_MAIL_NEWS
#CFLAGS += -DEDITOR
#endif
ifdef MOZ_MAIL_NEWS
INCLUDES += -I$(DEPTH)/lib/libmsg -I$(DEPTH)/dist/public/ldap
endif
DEFINES += -DNEW_DECODERS -DDELAYED_MENU_CREATION -DNETCASTER_ZAXIS_HACKERY
DEFINES += -DUSE_MAGIC_TOOLBAR
@ -355,7 +338,7 @@ $(LIBRARY): $(OBJS)
# note the header file is generated as a side effect here.
$(OBJDIR)/commands.c $(OBJDIR)/commands.h: $(OBJDIR)/mkcommands xfe_commands
@echo Generating command table information... ; \
$(OBJDIR)/mkcommands -table $(OBJDIR)/commands.c -header $(OBJDIR)/commands.h $(srcdir)/xfe_commands
$(OBJDIR)/mkcommands -table $(OBJDIR)/commands.c -header $(OBJDIR)/commands.h $(srcdir)xfe_commands
$(OBJDIR)/commands.o: $(OBJDIR)/commands.c
$(CC) -c -I. -o $@ $(OBJDIR)/commands.c

View File

@ -34,6 +34,10 @@ endif
ifdef MOZ_MAIL_NEWS
DIRS += libmsg
else
ifdef MOZ_MAIL_COMPOSE
DIRS += mailto
endif
endif
ifdef MOZ_NEO

View File

@ -57,9 +57,6 @@ CSRCS = \
addr.c \
$(NULL)
# mimevcrd.c \
REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
include $(topsrcdir)/config/rules.mk
@ -68,12 +65,16 @@ FILT_SRCS = mimefilt.c mimestub.c
FILT_OBJS = $(addprefix $(OBJDIR)/,$(FILT_SRCS:.c=.o))
ifdef MOZ_SECURITY
INCLUDES += -I$(DEPTH)/lib/libmime -I$(DIST)/public/security
INCLUDES += -I$(topsrcdir)/lib/libmime -I$(DIST)/public/security
endif
INCLUDES += -I$(srcdir)/
INCLUDES += -I$(srcdir)/./
DEFINES += -DMOZILLA_30 -DNO_SECURITY
ifndef MOZ_MAIL_COMPOSE
DEFINES += -DMOZILLA_30
endif
DEFINES += -DNO_SECURITY
#
# Building the "mimefilt" executable, which reads a message from stdin and

View File

@ -16,11 +16,11 @@
# Reserved.
DEPTH = ../..
topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
@ -40,6 +40,10 @@ include $(topsrcdir)/config/config.mk
ifdef MOZ_MAIL_NEWS
CSRCS += mime.c
else
ifdef MOZ_MAIL_COMPOSE
CSRCS += mime.c
endif
endif
include $(topsrcdir)/config/rules.mk

View File

@ -0,0 +1,97 @@
#!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@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mailto
LIBRARY_NAME = mailto
CSRCS = \
ad_strm.c \
ap_decod.c \
ap_encod.c \
appledbl.c \
bh_strm.c \
m_binhex.c \
msgutils.c \
$(NULL)
CPPSRCS = \
addrutil.cpp \
bytearr.cpp \
dwordarr.cpp \
mhtmlstm.cpp \
msgbg.cpp \
msgcflds.cpp \
msgcpane.cpp \
msgglue.cpp \
msgmast.cpp \
msgmdn.cpp \
msgpane.cpp \
msgppane.cpp \
msgprefs.cpp \
msgsend.cpp \
msgsendp.cpp \
msgurlq.cpp \
msgzap.cpp \
ptrarray.cpp \
$(NULL)
# We'd like to include msgdlqml.cpp eventually (deliver queued mail)
EXPORTS = \
ad_codes.h \
appledbl.h \
bytearr.h \
dwordarr.h \
errcode.h \
error.h \
m_binhex.h \
mhtmlstm.h \
msg.h \
msgcflds.h \
msgcpane.h \
msghdr.h \
msgmast.h \
msgmdn.h \
msgpane.h \
msgppane.h \
msgprefs.h \
msgprnot.h \
msgsend.h \
msgsendp.h \
msgutils.h \
msgzap.h \
ptrarray.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
REQUIRES = nspr htmldlgs img util layer pref security js java net progress network
include $(topsrcdir)/config/rules.mk
# INCLUDES += -I$(DIST)/include -I$(PUBLIC)/security -I$(srcdir)/../libaddr -I$(PUBLIC)/msg

View File

@ -55,6 +55,12 @@ DIRS += \
imap4 \
certld \
$(NULL)
else
ifdef MOZ_MAIL_COMPOSE
DIRS += \
smtp \
$(NULL)
endif
endif
DIRS += http