X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=e1fdf58ebefd0d652f6d27c5a2566f4b91b94728;hp=f09fc6ca5352ee7313204ffd409511b16526911c;hb=5f0d69cc13a116be64a243c07bad259af7d90397;hpb=1410cfc03a04ccce7aac48a62f9d465ab341cef1

diff --git a/Makefile.am b/Makefile.am
index f09fc6c..e1fdf58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,11 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
-.cpkg.c: ; ./lib-lua/luapkg2c.pl -c $< > $@
-
 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)
 
@@ -19,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 \
@@ -39,13 +37,14 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		$(top_builddir)/lib-lib/liblib.a \
 		$(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-madmutt_DEPENDENCIES = $(top_builddir)/lib-lua/madmutt.h \
-		       $(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 \
 		       $(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 \
@@ -149,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 tools/cpkg2c.mk
+-include tools/cflags.mk
 
 wc:
 	@sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'