projects / apps / madmutt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rocco Rutte:
[apps/madmutt.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a1172fc..8a17ce3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,26 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
+EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_IMAP
 IMAP_SUBDIR = imap
 IMAP_INCLUDES = -I$(top_srcdir)/imap
 endif
 
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+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
 
-bin_SCRIPTS = muttbug flea
+SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+
+bin_SCRIPTS = muttngbug fleang
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 
@@ -27,14 +37,14 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        rfc822.c rfc1524.c rfc2047.c rfc2231.c \
        score.c send.c sendlib.c signal.c sort.c \
        status.c system.c thread.c charset.c history.c lib.c \
-       muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
-       url.c ascii.c mutt_idna.c sidebar.c hcache.c
+       muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c md5c.c \
+       url.c ascii.c mutt_idna.c sidebar.c hcache.c crypt-mod.c crypt-mod.h
 
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
-       $(INTLLIBS) $(LIBICONV)
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
+       -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
-       $(INTLDEPS)
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_srcdir)/lib/libsane.a \
+       $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD =
@@ -53,42 +63,45 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
        -DHAVE_CONFIG_H=1
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(POP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 
 EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
-       mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
+       mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
-       pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c \
-       sidebar.h
+       pgppacket.c mutt_idna.h mutt_libesmtp.c \
+       sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c
 
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        configure acconfig.h account.h \
        compress.h \
-       attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs \
+       attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
        globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
-       mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
-       mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h \
+       mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
+       mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \
        rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \
-       nntp.h ChangeLog.nntp \
        _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
        mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
        makedoc.c stamp-doc-rc README.SSL smime.h\
-       muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
+       muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh       \
        ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
-       snprintf.c regex.c mutt_libesmtp.h
+       snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
+
+muttng_dotlock_SOURCES = mutt_dotlock.c
+muttng_dotlock_LDADD = @LIBOBJS@
+muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
-mutt_dotlock_SOURCES = mutt_dotlock.c
-mutt_dotlock_LDADD = @LIBOBJS@
-mutt_dotlock_DEPENDENCIES = @LIBOBJS@
+pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib -lsane
+pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 
-pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
-pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
-pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+pgpewrapng_SOURCES = pgpewrap.c
+pgpewrapng_LDADD = 
+pgpewrapng_DEPENDENCIES = 
 
 mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
@@ -102,13 +115,13 @@ LDADD = @LIBOBJS@ @INTLLIBS@
 
 OPS=@OPS@
 
-flea:  muttbug.sh
-       cp muttbug.sh flea
-       chmod +x flea
+fleang:        muttbug.sh
+       cp muttbug.sh fleang
+       chmod +x fleang
 
-smime_keys: $(srcdir)/smime_keys.pl
-       cp $(srcdir)/smime_keys.pl smime_keys
-       chmod +x smime_keys
+smime_keysng: $(srcdir)/smime_keys.pl
+       cp $(srcdir)/smime_keys.pl smime_keysng
+       chmod +x smime_keysng
 
 Makefile: $(BUILT_SOURCES)
 
@@ -127,14 +140,14 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
        $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 
 install-exec-local:
-       if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then  \
+       if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then        \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
-               ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+               ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
        fi
-       if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-               chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-               chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-               { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+       if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
+               chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \
+               chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \
+               { echo "Can't fix muttng_dotlock's permissions!" >&2 ; exit 1 ; } \
        fi
 
 install-data-local: Muttngrc
@@ -146,8 +159,8 @@ install-data-local: Muttngrc
        elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
                $(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
        fi
-       -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-               $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
+       -if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \
+               $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
        fi
 
 
@@ -155,23 +168,24 @@ install-data-local: Muttngrc
 # used manually.
 
 pclean:
-       cat /dev/null > PATCHES
+       cat /dev/null > $(top_srcdir)/PATCHES
 
 check-security:
-       ./check_sec.sh
+       (cd $(top_srcdir) && ./check_sec.sh)
 
 commit-real:
-       cvs commit
+       (cd $(top_srcdir) && cvs commit)
 
 commit-changelog:
-       cvs commit -m "# changelog commit" ChangeLog
+       (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog)
 
 commit: pclean check-security commit-real changelog commit-changelog
 
 changelog:
-       cvs update ChangeLog
-       sh ./mkchangelog.sh | fmt -c | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog
-       $${VISUAL:-vi} ChangeLog
+       (cd $(top_srcdir); \
+       cvs update ChangeLog; \
+       sh ./mkchangelog.sh | fmt -c | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
+       $${VISUAL:-vi} ChangeLog)
 
 ChangeLog: changelog
 
Fork of Mutt-ng that was a fork of Mutt in the first place.