X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=65c1bee3beda78a2ec1eeb9f4e68272d8d8414b2;hp=6753f5e93ff10d7ad5b318d653bb37516a849b4f;hb=05e61a9707a6da5c0bca77aa7c3c019a918494de;hpb=e9c789ec6a2a9195fd3334b321bde17c6bf5d634

diff --git a/Makefile.am b/Makefile.am
index 6753f5e..65c1bee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,20 +4,24 @@
 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 \
-	  lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
+	  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
 madmutt_SOURCES = $(BUILT_SOURCES) \
-	alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
+	alias.cpkg 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 \
@@ -33,15 +37,19 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		$(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@ \
+madmutt_DEPENDENCIES = $(top_builddir)/lib-lua/madmutt.li \
+		       $(top_builddir)/lib-lua/lua-token.h \
+		       @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-ui/libui.a \
+		       $(top_builddir)/lib-lua/liblua.a \
 		       $(top_builddir)/lib-mx/libmx.a \
 		       \
 		       $(top_builddir)/pop/libpop.a   \
@@ -91,7 +99,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
 
@@ -107,9 +115,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 ;		\
@@ -146,7 +151,6 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head
 		$(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
 	touch $@
 
-
 -include cflags.mk
 
 wc: