target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
+EXTRA_PROGRAMS = muttng_dotlock pgpring makedoc
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-bin_SCRIPTS = muttbug flea
+bin_SCRIPTS = muttngbug fleang
BUILT_SOURCES = keymap_defs.h patchlist.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
+ 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) \
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
+ 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 \
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 \
+ 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
-mutt_dotlock_SOURCES = mutt_dotlock.c
-mutt_dotlock_LDADD = @LIBOBJS@
-mutt_dotlock_DEPENDENCIES = @LIBOBJS@
+muttng_dotlock_SOURCES = mutt_dotlock.c
+muttng_dotlock_LDADD = @LIBOBJS@
+muttng_dotlock_DEPENDENCIES = @LIBOBJS@
pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
pgpring_LDADD = @LIBOBJS@ $(INTLLIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \
- muttbug.sh Muttrc.head doc/instdoc.sh
-EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) makedoc$(EXEEXT)
+ muttbug.sh Muttngrc.head doc/instdoc.sh
+EXTRA_PROGRAMS = muttng_dotlock$(EXEEXT) pgpring$(EXEEXT) \
+ makedoc$(EXEEXT)
bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
@SMIMEAUX_TARGET@
PROGRAMS = $(bin_PROGRAMS)
am_makedoc_OBJECTS = makedoc.$(OBJEXT)
makedoc_OBJECTS = $(am_makedoc_OBJECTS)
makedoc_LDFLAGS =
-am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
-mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS)
-mutt_dotlock_LDFLAGS =
am__objects_1 = patchlist.$(OBJEXT)
am_muttng_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
- wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
- mutt_idna.$(OBJEXT) sidebar.$(OBJEXT)
+ wcwidth.$(OBJEXT) md5c.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
+ mutt_idna.$(OBJEXT) sidebar.$(OBJEXT) hcache.$(OBJEXT) \
+ crypt-mod.$(OBJEXT)
muttng_OBJECTS = $(am_muttng_OBJECTS)
muttng_LDFLAGS =
+am_muttng_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
+muttng_dotlock_OBJECTS = $(am_muttng_dotlock_OBJECTS)
+muttng_dotlock_LDFLAGS =
am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) lib.$(OBJEXT) \
extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
pgppacket.$(OBJEXT) ascii.$(OBJEXT)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) \
- $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)
+DIST_SOURCES = $(makedoc_SOURCES) $(muttng_SOURCES) \
+ $(EXTRA_muttng_SOURCES) $(muttng_dotlock_SOURCES) \
+ $(pgpring_SOURCES)
RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
ps-recursive install-info-recursive uninstall-info-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README ABOUT-NLS ChangeLog INSTALL Makefile.am \
- Makefile.in Muttrc.head.in NEWS TODO acconfig.h aclocal.m4 \
+ Makefile.in Muttngrc.head.in NEWS TODO acconfig.h aclocal.m4 \
config.guess config.h.in config.sub configure configure.in \
depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \
snprintf.c strcasecmp.c strdup.c
DIST_SUBDIRS = m4 po intl doc contrib imap
-SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)
+SOURCES = $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(muttng_dotlock_SOURCES) $(pgpring_SOURCES)
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
cd $(top_builddir) && $(SHELL) ./config.status $@
muttbug.sh: $(top_builddir)/config.status muttbug.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-Muttrc.head: $(top_builddir)/config.status Muttrc.head.in
+Muttngrc.head: $(top_builddir)/config.status Muttngrc.head.in
cd $(top_builddir) && $(SHELL) ./config.status $@
doc/instdoc.sh: $(top_builddir)/config.status $(top_srcdir)/doc/instdoc.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
@rm -f makedoc$(EXEEXT)
$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
-mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES)
- @rm -f mutt_dotlock$(EXEEXT)
- $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS)
muttng$(EXEEXT): $(muttng_OBJECTS) $(muttng_DEPENDENCIES)
@rm -f muttng$(EXEEXT)
$(LINK) $(muttng_LDFLAGS) $(muttng_OBJECTS) $(muttng_LDADD) $(LIBS)
+muttng_dotlock$(EXEEXT): $(muttng_dotlock_OBJECTS) $(muttng_dotlock_DEPENDENCIES)
+ @rm -f muttng_dotlock$(EXEEXT)
+ $(LINK) $(muttng_dotlock_LDFLAGS) $(muttng_dotlock_OBJECTS) $(muttng_dotlock_LDADD) $(LIBS)
pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES)
@rm -f pgpring$(EXEEXT)
$(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS)
mutt_dotlock.c: dotlock.c
cp $(srcdir)/dotlock.c mutt_dotlock.c
-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
$(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
# 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
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