X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=9884cf36c8df7e5c182f9a3e5cbf217aec139324;hp=6d514b8e87c5d14df43711c3ef6461cb537c7887;hb=e7a772dca1b86e4036d25038ee67aa34dd217c07;hpb=ffb2d4f3705ffc083472d04a3c58146b6bc8bfea

diff --git a/Makefile.am b/Makefile.am
index 6d514b8..9884cf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,9 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = tools intl m4 po \
-	  lib-lua lib-mime lib-lib lib-mx lib-hash lib-sys lib-ui \
-	  pop imap $(NNTP_SUBDIR)
+SUBDIRS = tools intl po \
+	  lib-lua lib-mime lib-lib lib-mx lib-sys lib-ui \
+	  imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h charset.gperf
 DISTCLEANFILES = $(BUILT_SOURCES)
@@ -22,14 +22,12 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 	handler.c headers.c help.c hook.c main.c muttlib.c mutt_idna.c \
 	pager.c pattern.c postpone.c recvattach.c recvcmd.c score.c send.c \
 	sendlib.c send_smtp.c sort.c state.c thread.c account.c remailer.c \
-	mutt_sasl.c
+	mutt_sasl.c pop.c
 
 madmutt_LDADD = $(top_builddir)/lib-mime/libmime.a \
 		$(top_builddir)/lib-mx/libmx.a \
 		$(top_builddir)/imap/libimap.a \
-		$(top_builddir)/pop/libpop.a \
 		$(LIBNNTP) \
-		$(top_builddir)/lib-hash/libhash.a \
 		$(top_builddir)/lib-sys/libsys.a \
 		$(top_builddir)/lib-ui/libui.a \
 		$(top_builddir)/lib-lua/liblua.a \
@@ -38,13 +36,11 @@ madmutt_LDADD = $(top_builddir)/lib-mime/libmime.a \
 
 madmutt_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a \
 		       $(top_builddir)/lib-mime/libmime.a \
-		       $(top_builddir)/lib-hash/libhash.a \
 		       $(top_builddir)/lib-sys/libsys.a \
 		       $(top_builddir)/lib-ui/libui.a \
 		       $(top_builddir)/lib-lua/liblua.a \
 		       $(top_builddir)/lib-mx/libmx.a \
 		       \
-		       $(top_builddir)/pop/libpop.a   \
 		       $(top_builddir)/imap/libimap.a \
 		       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -97,4 +93,4 @@ include tools/cpkg2c.mk
 -include tools/cflags.mk
 
 wc:
-	@sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'
+	@sloccount $(wildcard *.h *.c) $(wildcard lib-*/) imap nntp | grep 'ansic[=:]'