X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=371b8775eefdbd9e86e940903d35a752d31fcc08;hp=bb631e94893c172ca2050abb395b5ef1382f48c4;hb=fc7b90fd61ac9efd35a5b506cc10679969d84cba;hpb=3de2c85955793f4d6898884915121959ca465d0f

diff --git a/Makefile.am b/Makefile.am
index bb631e9..371b877 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,11 @@ 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
+BUILT_SOURCES = keymap_defs.h charset.gperf
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
@@ -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 Madmuttrc
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -100,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 ;		\