X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=1b74d017ac3d99f35a1e6b462af27aa9c2b6aa76;hp=f0497e0c23a93c6baf4944ef9118bc6757adf20d;hb=ac1ea3143e61def7fc9000bee6d0d59d56c5b997;hpb=96e4b6de291b2195b26289fb03536acd101c6650

diff --git a/Makefile.am b/Makefile.am
index f0497e0..1b74d01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-	  lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
+	  lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h charset.gperf
@@ -29,7 +29,7 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 	       -Limap -limap -Lpop -lpop $(LIBNNTP) \
 	       -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
 	       -Llib-sys -lsys -Llib-ui -lui \
-	       -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+	       $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		       $(top_builddir)/lib-lib/liblib.a \
@@ -37,7 +37,6 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		       $(top_builddir)/lib-crypt/libcrypt.a \
 		       $(top_builddir)/lib-hash/libhash.a \
 		       $(top_builddir)/lib-ui/libui.a \
-		       $(top_builddir)/lib/libsane.a \
 		       \
 		       $(top_builddir)/pop/libpop.a  \
 		       $(top_builddir)/imap/libimap.a \
@@ -62,12 +61,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
 
@@ -77,7 +76,7 @@ madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
 
 pgpringng_SOURCES = pgppubring.c lib.c extlib.c
 pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
-		  -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt -Llib -lsane
+		  -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt
 pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
 			 $(top_builddir)/lib-lib/liblib.a \
 			 $(top_builddir)/lib-hash/libhash.a
@@ -104,13 +103,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