X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=9978ecdc3952c262740d9df21b55ab6dfcbe0261;hp=54167f5388c24e0e9fa1b39787ce211ab60384ed;hb=7d7b69b974a2db6f66c586de0840ec55c4150d0e;hpb=3ad8157bbbc6b9fae1c3252aad1c07fcccd92004

diff --git a/Makefile.am b/Makefile.am
index 54167f5..9978ecd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ NNTP_SUBDIR = nntp
 endif
 
 SUBDIRS = tools intl m4 po \
-	  lib-lua lib-mime lib-lib lib-mx lib-hash lib-sys lib-ui \
+	  lib-lua lib-mime lib-lib lib-mx lib-sys lib-ui \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h charset.gperf
@@ -18,30 +18,25 @@ DISTCLEANFILES = $(BUILT_SOURCES)
 bin_PROGRAMS = madmutt madmutt_dotlock
 madmutt_SOURCES = $(BUILT_SOURCES) \
 	alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
-	compose.c copy.c crypt.c editmsg.c init.c keymap.c \
-	flags.c from.c 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 sort.c state.c thread.c account.c remailer.c
+	compose.c copy.c crypt.c editmsg.c init.c keymap.c flags.c from.c \
+	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
 
-madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-		$(top_builddir)/lib-mime/libmime.a \
+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 \
 		$(top_builddir)/lib-lib/liblib.a \
 		$(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-madmutt_DEPENDENCIES = \
-		       \
-		       @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-		       $(top_builddir)/lib-lib/liblib.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 \
@@ -61,28 +56,23 @@ INCLUDES=-I$(top_srcdir) $(GPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
-EXTRA_madmutt_SOURCES = \
-	account.c mutt_sasl.c dotlock.c remailer.c \
-	alias.h browser.h remailer.h state.h \
-	mutt_idna.h mutt_libesmtp.c state.h
-
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS TODO \
 	configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-	buffy.h charset.h copy.h crypt.c 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 pager.h protos.h \
-	sort.h autogen.sh remailer.c remailer.h browser.h state.h \
-	README.SSL depcomp mutt_idna.h mutt_libesmtp.h
+	alias.h browser.h remailer.h state.h mutt_idna.h state.h buffy.h \
+	charset.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 pager.h \
+	protos.h sort.h autogen.sh remailer.h browser.h state.h README.SSL \
+	depcomp mutt_idna.h send_smtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
-madmutt_dotlock_LDADD = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
-madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
+madmutt_dotlock_LDADD = $(top_builddir)/lib-lib/liblib.a
+madmutt_dotlock_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a
 
 CLEANFILES = keymap_defs.h
 
 ACLOCAL_AMFLAGS = -I m4
 
-LDADD = @LIBOBJS@ @LIBINTL@
+LDADD = @LIBINTL@
 
 charset.gperf: charset.def
 	sh $< > $@