fixes and simplifications to fix gpg regression.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb631e9..5b068a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,18 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib tools \
          lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
          pop imap $(NNTP_SUBDIR)
 
-BUILT_SOURCES = keymap_defs.h version.h charset.gperf
+BUILT_SOURCES = keymap_defs.h version.h charset.gperf rctokens.gperf rcparser.c rcparser.h
 DISTCLEANFILES = $(BUILT_SOURCES)
 
+rcparser.c rcparser.h: rcparser.y
+       $(MAKE) -C tools lemon
+       $(top_builddir)/tools/lemon -s $<
+       touch rcparser.c rcparser.h
+
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
        alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
@@ -24,9 +29,9 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
        score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-              -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
+              -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
-              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \
+              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui -Llib-lib -llib \
               $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
@@ -37,7 +42,7 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-ui/libui.a \
                       $(top_builddir)/lib-mx/libmx.a \
                       \
-                      $(top_builddir)/pop/libpop.a  \
+                      $(top_builddir)/pop/libpop.a   \
                       $(top_builddir)/imap/libimap.a \
                       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -93,6 +98,9 @@ LDADD = @LIBOBJS@ @LIBINTL@
 charset.gperf: charset.def
        sh $< > $@
 
+rctokens.gperf: rctokens.sh
+       sh $< > $@
+
 smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng