Signed-off-by: Pierre Habouzit <madcoder@debian.org>
14 files changed:
NNTP_INCLUDES = -I$(top_srcdir)/nntp
endif
NNTP_INCLUDES = -I$(top_srcdir)/nntp
endif
-SUBDIRS = intl m4 po lib-lib intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po lib-lib lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
bin_SCRIPTS = muttngbug fleang
bin_SCRIPTS = muttngbug fleang
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 \
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 md5c.c menu.c mh.c muttlib.c mutt_idna.c mx.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 rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
wcwidth.c
muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
wcwidth.c
muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
- -Llib-lib -llib -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+ -Llib-lib -llib -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 \
CPPFLAGS=@CPPFLAGS@ -I$(includedir)
EXTRA_muttng_SOURCES = \
CPPFLAGS=@CPPFLAGS@ -I$(includedir)
EXTRA_muttng_SOURCES = \
- account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+ 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 smime.c pgp.c pgpinvoke.c pgpkey.c \
- pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.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 \
alias.h browser.h enter.h \
mbyte.h remailer.h url.h state.h \
pgppacket.c mutt_idna.h mutt_libesmtp.c \
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 \
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 crypthash.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 \
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 \
- mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
+ mapping.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 reldate.h rfc1524.h rfc2047.h \
rfc2231.h rfc822.h rfc3676.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 reldate.h rfc1524.h rfc2047.h \
rfc2231.h rfc822.h rfc3676.h \
- sha1.h sort.h mime.types autogen.sh \
+ 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\
_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\
muttng_dotlock_LDADD = @LIBOBJS@
muttng_dotlock_DEPENDENCIES = @LIBOBJS@
muttng_dotlock_LDADD = @LIBOBJS@
muttng_dotlock_DEPENDENCIES = @LIBOBJS@
-pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c
-pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib -lsane
+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)
pgpewrapng_SOURCES = pgpewrap.c
pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
pgpewrapng_SOURCES = pgpewrap.c
po/Makefile.in doc/Makefile contrib/Makefile
muttbug.sh
lib-lib/Makefile
po/Makefile.in doc/Makefile contrib/Makefile
muttbug.sh
lib-lib/Makefile
lib/Makefile
imap/Makefile
pop/Makefile
lib/Makefile
imap/Makefile
pop/Makefile
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
#include "mutt.h"
#ifdef USE_IMAP
#include "mutt.h"
#ifdef USE_IMAP
#include "mime.h"
#include "mx.h"
#include "lib.h"
#include "mime.h"
#include "mx.h"
#include "lib.h"
#include "imap_private.h"
#include "auth.h"
#include "imap_private.h"
#include "auth.h"
#define MD5_BLOCK_LEN 64
#define MD5_DIGEST_LEN 16
#include <lib-lib/macros.h>
#define MD5_BLOCK_LEN 64
#define MD5_DIGEST_LEN 16
#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
#include "lib/debug.h"
/* forward declarations */
#include "lib/debug.h"
/* forward declarations */
--- /dev/null
+noinst_LIBRARIES = libhash.a
+
+libhash_a_SOURCES = md5.h sha1.h crypthash.h \
+ md5.c sha1.c
+
+noinst_HEADERS = md5.h sha1.h
+
/* POINTER defines a generic pointer type */
typedef unsigned char *POINTER;
/* POINTER defines a generic pointer type */
typedef unsigned char *POINTER;
+#include "sha1.h"
+#include "md5.h"
+
#ifndef MD5_H
#define MD5_H 1
#ifndef MD5_H
#define MD5_H 1
/* MD5 context. */
typedef struct {
/* MD5 context. */
typedef struct {
#ifndef _SHA1_H
# define _SHA1_H
#ifndef _SHA1_H
# define _SHA1_H
typedef struct {
uint32_t state[5];
typedef struct {
uint32_t state[5];
#include <time.h>
#include <lib-lib/mem.h>
#include <time.h>
#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-hash/hash.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
-#include "sha1.h"
-#include "md5.h"
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
+++ /dev/null
-/^"POT-Creation-Date: .*"$/{
-x
-s/P/P/
-ta
-g
-d
-bb
-:a
-x
-:b
-}
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
#include "mutt.h"
#include "mx.h"
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include "lib/debug.h"
#include "pop.h"
#include "lib/debug.h"