X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=Makefile.am;h=d07b188fad76b51e96fd7e709b77a0566f09cddc;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hp=afee72e0944420fc5557d34b4fe4c5e832c3c3d6;hpb=21595f98b7c8132f99abb9fee60ecdce31fc980f;p=apps%2Fmadmutt.git

diff --git a/Makefile.am b/Makefile.am
index afee72e..d07b188 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ NNTP_SUBDIR = nntp
 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
 
@@ -30,15 +30,11 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	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 hash.c hcache.c hdrline.c headers.c help.c history.c hook.c \
-	init.c \
-	keymap.c \
-	lib.c list.c \
-	main.c mbox.c mbyte.c md5c.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
+	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 \
@@ -48,7 +44,7 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	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 \
@@ -77,12 +73,10 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(POP_INCLUDES) $(NNTP_INCLUDES) $
 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 \
-	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
-	alias.h browser.h \
-	enter.h \
-	list.h \
+	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 \
@@ -91,17 +85,15 @@ EXTRA_muttng_SOURCES = \
 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 \
-	list.h \
-	globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
-	mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
+	globals.h history.h init.h keymap.h mutt_crypt.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 \
-	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\
@@ -113,8 +105,8 @@ muttng_dotlock_SOURCES = dotlock.c
 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