Move things around: more DT_SYS variables into the lua !

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b068a4..371b877 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,18 +8,13 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib tools \
-         lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
+         lib-mime lib-lib lib-lua lib-mx lib-crypt lib-hash lib-sys lib-ui \
          pop imap $(NNTP_SUBDIR)
 
-BUILT_SOURCES = keymap_defs.h version.h charset.gperf rctokens.gperf rcparser.c rcparser.h
+BUILT_SOURCES = keymap_defs.h charset.gperf
 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 \
@@ -29,10 +24,18 @@ 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-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
-              -Limap -limap -Lpop -lpop $(LIBNNTP) \
-              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui -Llib-lib -llib \
-              $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+               $(top_builddir)/lib-mime/libmime.a \
+               $(top_builddir)/lib-crypt/libcrypt.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 \
@@ -40,6 +43,7 @@ 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-lua/liblua.a \
                       $(top_builddir)/lib-mx/libmx.a \
                       \
                       $(top_builddir)/pop/libpop.a   \
@@ -89,7 +93,7 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -98,9 +102,6 @@ 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
@@ -108,9 +109,6 @@ smime_keysng: $(srcdir)/smime_keys.pl
 keymap_defs.h: OPS
        $(srcdir)/gen_defs $^ > keymap_defs.h
 
-version.h:
-       echo "#define MUTT_REVISION \"git\"" > version.h
-
 install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/madmutt_dotlock ; then       \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \