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 bd8aab9..4330ce2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,11 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
-.cpkg.c:  ; ./lib-lua/luapkg2c.pl -c $< > $@
-.cpkg.li: ; ./lib-lua/luapkg2c.pl -h $< > $@
-
-
 if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
+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)
 
@@ -21,7 +17,7 @@ DISTCLEANFILES = $(BUILT_SOURCES)
 
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
-       alias.cpkg attach.c base64.c browser.c buffy.c charset.c commands.c \
+       alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
        compose.c copy.c editmsg.c init.c keymap.c lib.c \
        flags.c from.c handler.c headers.c help.c hook.c \
        main.c muttlib.c mutt_idna.c pager.c pattern.c postpone.c recvattach.c recvcmd.c \
@@ -41,8 +37,8 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                $(top_builddir)/lib-lib/liblib.a \
                $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-madmutt_DEPENDENCIES = $(top_builddir)/lib-lua/madmutt.li \
-                      $(top_builddir)/lib-lua/lua-token.h \
+madmutt_DEPENDENCIES = \
+                      \
                       @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-lib/liblib.a \
                       $(top_builddir)/lib-mime/libmime.a \
@@ -152,7 +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[=:]'