add placeholders for the liblua

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ba97c23..7b375e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-         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
@@ -24,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-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
-              -Limap -limap -Lpop -lpop $(LIBNNTP) \
-              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \
-              $(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 \
@@ -35,9 +43,10 @@ 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  \
+                      $(top_builddir)/pop/libpop.a   \
                       $(top_builddir)/imap/libimap.a \
                       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -84,7 +93,7 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -97,8 +106,6 @@ smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng
 
-Makefile: $(BUILT_SOURCES)
-
 keymap_defs.h: OPS
        $(srcdir)/gen_defs $^ > keymap_defs.h
 
@@ -130,14 +137,6 @@ install-data-local: Madmuttrc
        fi
 
 
-# kluge around automake problems.
-
-dist-hook:
-       -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
-mutt-dist:
-       (cd $(srcdir) && ./build-release )
-
 update-doc: stamp-doc-rc
        (cd doc && $(MAKE) update-doc)
 
@@ -147,7 +146,7 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head
        -rm -f Madmuttrc stamp-doc-rc
        $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
                $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
-       touch stamp-doc-rc
+       touch $@
 
 
 -include cflags.mk