update source to use our brand new source generator. Update automakes.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb631e9..4330ce2 100644 (file)
--- 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 = tools intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
+         lib-lua 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 charset.gperf
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
@@ -24,20 +24,32 @@ 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)
-
-madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+               $(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 \
                       $(top_builddir)/lib-mime/libmime.a \
                       $(top_builddir)/lib-crypt/libcrypt.a \
                       $(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-mx/libmx.a \
                       \
-                      $(top_builddir)/pop/libpop.a  \
+                      $(top_builddir)/pop/libpop.a   \
                       $(top_builddir)/imap/libimap.a \
                       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -84,7 +96,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 +112,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 ;                \
@@ -139,8 +148,8 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head
                $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
        touch $@
 
-
--include cflags.mk
+include $(top_builddir)/tools/cpkg2c.mk
+-include $(top_buildir)/tools/cflags.mk
 
 wc:
        @sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'