From 8cf8034a805e70fb34b170e9ceefdf99a2797e60 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 18 Nov 2006 12:11:28 +0100 Subject: [PATCH 1/1] merge OPS that do not need to be split anymore. Signed-off-by: Pierre Habouzit --- Makefile.am | 14 ++++++-------- OPS | 11 +++++++++++ OPS.CRYPT | 4 ---- OPS.PGP | 6 ------ OPS.SMIME | 1 - configure.ac | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 OPS.CRYPT delete mode 100644 OPS.PGP delete mode 100644 OPS.SMIME diff --git a/Makefile.am b/Makefile.am index f0497e0..6ee39c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,12 +62,12 @@ EXTRA_madmutt_SOURCES = \ alias.h browser.h remailer.h state.h \ mutt_idna.h mutt_libesmtp.c state.h -EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ +EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.MIX TODO \ configure account.h alias.h attach.h recvattach.h handler.h thread.h \ buffy.h charset.h compress.h copy.h dotlock.h functions.def gen_defs \ recvattach.h handler.h thread.h globals.h init.h keymap.h \ mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h \ - sort.h mime.types autogen.sh OPS.MIX remailer.c remailer.h browser.h state.h \ + sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \ lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \ makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h @@ -104,13 +104,11 @@ smime_keysng: $(srcdir)/smime_keys.pl Makefile: $(BUILT_SOURCES) -keymap_defs.h: $(OPS) $(srcdir)/gen_defs - $(srcdir)/gen_defs $(OPS) > keymap_defs.h +keymap_defs.h: $(OPS) + $(srcdir)/gen_defs $^ > keymap_defs.h -keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs - $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \ - $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \ - > keymap_alldefs.h +keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.MIX + $(srcdir)/gen_defs $^ > keymap_alldefs.h version.h: echo "#define MUTT_REVISION \"git\"" > version.h diff --git a/OPS b/OPS index cb979bd..156390e 100644 --- a/OPS +++ b/OPS @@ -205,3 +205,14 @@ OP_SIDEBAR_NEXT_NEW "go down to next mailbox with new mail" OP_SIDEBAR_PREV "go to previous mailbox" OP_SIDEBAR_PREV_NEW "go to previous mailbox with new mail" OP_SIDEBAR_OPEN "open hilighted mailbox" +OP_COMPOSE_ATTACH_KEY "attach a PGP public key" +OP_COMPOSE_PGP_MENU "show PGP options" +OP_MAIL_KEY "mail a PGP public key" +OP_VERIFY_KEY "verify a PGP public key" +OP_VIEW_ID "view the key's user id" +OP_CHECK_TRADITIONAL "check for classic pgp" +OP_COMPOSE_SMIME_MENU "show S/MIME options" +OP_DECRYPT_SAVE "make decrypted copy and delete" +OP_DECRYPT_COPY "make decrypted copy" +OP_FORGET_PASSPHRASE "wipe passphrase(s) from memory" +OP_EXTRACT_KEYS "extract supported public keys" diff --git a/OPS.CRYPT b/OPS.CRYPT deleted file mode 100644 index 0f5664c..0000000 --- a/OPS.CRYPT +++ /dev/null @@ -1,4 +0,0 @@ -OP_DECRYPT_SAVE "make decrypted copy and delete" -OP_DECRYPT_COPY "make decrypted copy" -OP_FORGET_PASSPHRASE "wipe passphrase(s) from memory" -OP_EXTRACT_KEYS "extract supported public keys" diff --git a/OPS.PGP b/OPS.PGP deleted file mode 100644 index 8ab7eb1..0000000 --- a/OPS.PGP +++ /dev/null @@ -1,6 +0,0 @@ -OP_COMPOSE_ATTACH_KEY "attach a PGP public key" -OP_COMPOSE_PGP_MENU "show PGP options" -OP_MAIL_KEY "mail a PGP public key" -OP_VERIFY_KEY "verify a PGP public key" -OP_VIEW_ID "view the key's user id" -OP_CHECK_TRADITIONAL "check for classic pgp" diff --git a/OPS.SMIME b/OPS.SMIME deleted file mode 100644 index 1161ff9..0000000 --- a/OPS.SMIME +++ /dev/null @@ -1 +0,0 @@ -OP_COMPOSE_SMIME_MENU "show S/MIME options" diff --git a/configure.ac b/configure.ac index 794c780..4c980b7 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,7 @@ ac_aux_path_sendmail=/usr/sbin:/usr/lib AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail) AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) -OPS="\$(srcdir)/OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT" +OPS="\$(srcdir)/OPS" dnl ---------------- gpgme ---------------- -- 2.20.1