projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build imap as well.
[apps/madmutt.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
a3d64f6
..
fbb9ded
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-4,28
+4,20
@@
AUTOMAKE_OPTIONS = foreign
EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
AUTOMAKE_OPTIONS = foreign
EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
-if BUILD_IMAP
-IMAP_SUBDIR = imap
-IMAP_INCLUDES = -I$(top_srcdir)/imap
-endif
-
-if BUILD_POP
-POP_SUBDIR = pop
-POP_INCLUDES = -I$(top_srcdir)/pop
-endif
-
if BUILD_NNTP
NNTP_SUBDIR = nntp
NNTP_INCLUDES = -I$(top_srcdir)/nntp
endif
if BUILD_NNTP
NNTP_SUBDIR = nntp
NNTP_INCLUDES = -I$(top_srcdir)/nntp
endif
-SUBDIRS = intl m4 po lib-lib lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po doc contrib \
+ lib-lib lib-mime lib-hash lib \
+ pop imap $(NNTP_SUBDIR)
bin_SCRIPTS = muttngbug fleang
BUILT_SOURCES = keymap_defs.h version.h
bin_SCRIPTS = muttngbug fleang
BUILT_SOURCES = keymap_defs.h version.h
-bin_PROGRAMS = muttng
@DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+bin_PROGRAMS = muttng
muttng_dotlock pgpringng pgpewrapng smime_keysng
muttng_SOURCES = $(BUILT_SOURCES) \
alias.c attach.c base64.c browser.c buffy.c \
charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
muttng_SOURCES = $(BUILT_SOURCES) \
alias.c attach.c base64.c browser.c buffy.c \
charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
@@
-35,22
+27,29
@@
muttng_SOURCES = $(BUILT_SOURCES) \
handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c \
main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c \
main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
- pager.c parse.c pattern.c postpone.c \
- query.c \
- recvattach.c recvcmd.c rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
+ pager.c parse.c pattern.c postpone.c query.c \
+ recvattach.c recvcmd.c rfc1524.c rfc3676.c \
score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
- thread.c \
- url.c utf8.c \
- wcwidth.c
+ thread.c url.c utf8.c wcwidth.c \
+ account.c mutt_socket.c mutt_tunnel.c \
+ pgp.c pgpinvoke.c pgpkey.c pgplib.c gnupgparse.c pgpmicalg.c pgppacket.c \
+ crypt-mod-pgp-classic.c smime.c crypt-mod-smime-classic.c
+
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
- -Llib-lib -llib -Llib-hash -lhash -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+ -Limap -limap -Lpop -lpop $(LIBNNTP) \
+ -Llib-lib -llib -Llib-mime -lmime -Llib-hash -lhash \
+ -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
$(top_builddir)/lib-lib/liblib.a \
muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
$(top_builddir)/lib-lib/liblib.a \
+ $(top_builddir)/lib-mime/libmime.a \
$(top_builddir)/lib-hash/libhash.a \
$(top_builddir)/lib/libsane.a \
$(top_builddir)/lib-hash/libhash.a \
$(top_builddir)/lib/libsane.a \
- $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
+ \
+ $(top_builddir)/pop/libpop.a \
+ $(top_builddir)/imap/libimap.a \
+ $(LIBNNTPDEPS) $(INTLDEPS)
makedoc_SOURCES = makedoc.c
makedoc_LDADD = -Llib-lib -llib
makedoc_SOURCES = makedoc.c
makedoc_LDADD = -Llib-lib -llib
@@
-62,31
+61,29
@@
DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(
POP_INCLUDES) $(
NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
CPPFLAGS=@CPPFLAGS@ -I$(includedir)
EXTRA_muttng_SOURCES = \
account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
CPPFLAGS=@CPPFLAGS@ -I$(includedir)
EXTRA_muttng_SOURCES = \
account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
- mutt_tunnel.c
smime.c
pgp.c pgpinvoke.c pgpkey.c \
+ mutt_tunnel.c pgp.c pgpinvoke.c pgpkey.c \
pgplib.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
alias.h browser.h enter.h \
mbyte.h remailer.h url.h state.h \
pgplib.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
alias.h browser.h enter.h \
mbyte.h remailer.h url.h state.h \
- pgppacket.c mutt_idna.h mutt_libesmtp.c \
- crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
- sidebar.h state.h
+ mutt_idna.h mutt_libesmtp.c sidebar.h state.h
EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
configure acconfig.h \
account.h alias.h attach.h recvattach.h handler.h thread.h \
buffy.h charset.h compress.h copy.h \
EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
configure acconfig.h \
account.h alias.h attach.h recvattach.h handler.h thread.h \
buffy.h charset.h compress.h copy.h \
- dotlock.h functions.
h
gen_defs \
+ dotlock.h functions.
def
gen_defs \
enter.h recvattach.h handler.h thread.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
enter.h recvattach.h handler.h thread.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
- m
apping.h m
ime.h mutt.h mutt_curses.h mutt_menu.h \
+ mime.h mutt.h mutt_curses.h mutt_menu.h \
mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
- mbox.h mh.h mx.h pager.h pgp.h protos.h rfc1524.h
rfc2047.h
\
- rfc
2231.h rfc822.h rfc
3676.h \
+ mbox.h mh.h mx.h pager.h pgp.h protos.h rfc1524.h \
+ rfc3676.h \
sort.h mime.types autogen.sh \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
sort.h mime.types autogen.sh \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
@@
-137,7
+134,7
@@
keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
-version.h:
Makefile.am
+version.h:
echo "#define MUTT_REVISION \"git\"" > version.h
install-exec-hook:
echo "#define MUTT_REVISION \"git\"" > version.h
install-exec-hook: