## 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
+
+SUBDIRS = intl m4 po lib-lib lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
-bin_SCRIPTS = muttbug flea
+bin_SCRIPTS = muttngbug fleang
-BUILT_SOURCES = keymap_defs.h patchlist.c
+BUILT_SOURCES = keymap_defs.h version.h
bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
muttng_SOURCES = $(BUILT_SOURCES) \
- addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
- compress.c crypt.c cryptglue.c \
- commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
- edit.c enter.c flags.c init.c filter.c from.c getdomain.c \
- handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
- main.c mbox.c menu.c mh.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 \
- 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
-
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
- $(INTLLIBS) $(LIBICONV)
-
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
- $(INTLDEPS)
+ alias.c attach.c base64.c browser.c buffy.c \
+ charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
+ compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
+ date.c edit.c editmsg.c enter.c \
+ flags.c filter.c from.c getdomain.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 \
+ 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
+
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
+ -Llib-lib -llib -Llib-hash -lhash -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+ $(top_builddir)/lib-lib/liblib.a \
+ $(top_builddir)/lib-hash/libhash.a \
+ $(top_builddir)/lib/libsane.a \
+ $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
makedoc_SOURCES = makedoc.c
-makedoc_LDADD =
-makedoc_DEPENDENCIES =
-
-# $(makedoc_OBJECTS): $(makedoc_SOURCES)
-# $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
-
-# makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-# @rm -rf makedoc
-# $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
+makedoc_LDADD = -Llib-lib -llib
+makedoc_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a
CPP=@CPP@
DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
- -DHAVE_CONFIG_H=1
+ -DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
-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 \
- 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
-
-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 \
- 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 \
- 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 Muttrc.head Muttrc \
+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 \
+ 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
+
+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 \
+ enter.h recvattach.h handler.h thread.h \
+ globals.h history.h init.h keymap.h mutt_crypt.h \
+ mime.h mutt.h mutt_curses.h mutt_menu.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 \
+ rfc2231.h rfc822.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 \
makedoc.c stamp-doc-rc README.SSL smime.h\
- muttbug 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
+ muttngbug pgppacket.h depcomp BEWARE \
+ mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
+ regex.c mutt_libesmtp.h crypt-gpgme.h
-mutt_dotlock_SOURCES = mutt_dotlock.c
-mutt_dotlock_LDADD = @LIBOBJS@
-mutt_dotlock_DEPENDENCIES = @LIBOBJS@
+muttng_dotlock_SOURCES = dotlock.c
+muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
+muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
-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)
+pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c pgppacket.c
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
+ -Llib-lib -llib -Llib-hash -lhash -Llib -lsane
+pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
+ $(top_builddir)/lib-lib/liblib.a \
+ $(top_builddir)/lib-hash/libhash.a
-mutt_dotlock.c: dotlock.c
- cp $(srcdir)/dotlock.c mutt_dotlock.c
+pgpewrapng_SOURCES = pgpewrap.c
+pgpewrapng_LDADD =
+pgpewrapng_DEPENDENCIES =
-CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
- keymap_alldefs.h keymap_defs.h patchlist.c
+CLEANFILES = stamp-doc-rc makedoc \
+ keymap_alldefs.h keymap_defs.h version.h
ACLOCAL_AMFLAGS = -I m4
-LDADD = @LIBOBJS@ @INTLLIBS@
+LDADD = @LIBOBJS@ @LIBINTL@
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)
$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
> keymap_alldefs.h
-reldate:
- echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
-
-patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
- $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
+version.h: Makefile.am
+ echo "#define MUTT_REVISION \"git\"" > version.h
-install-exec-local:
- if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \
+install-exec-hook:
+ 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 ; } \
fi
install-data-local: Muttngrc
elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttngrc ] ; then \
mv $(DESTDIR)$(pkgdatadir)/../Muttngrc* $(DESTDIR)$(sysconfdir) ; \
elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
- $(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
+ $(INSTALL) -m 644 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
-# Don't make this one ChangeLog - it's intended to be
-# used manually.
-
-pclean:
- cat /dev/null > PATCHES
-
-check-security:
- ./check_sec.sh
-
-commit-real:
- cvs commit
-
-commit-changelog:
- 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
-
-ChangeLog: changelog
-
# kluge around automake problems.
dist-hook:
update-doc: stamp-doc-rc
(cd doc && $(MAKE) update-doc)
-Muttrc: stamp-doc-rc
+Muttngrc: stamp-doc-rc
-stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
- -rm -f Muttrc stamp-doc-rc
+stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
+ -rm -f Muttngrc stamp-doc-rc
$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
- $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
+ $(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc
touch stamp-doc-rc
-.PHONY: commit pclean check-security commit-real commit-changelog
-.PHONY: changelog ChangeLog
+-include cflags.mk
projects / apps / madmutt.git / blobdiff