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

diff --git a/Makefile.am b/Makefile.am
index 371b877..4330ce2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
-	  lib-mime lib-lib lib-lua 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 charset.gperf
@@ -37,11 +37,14 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		$(top_builddir)/lib-lib/liblib.a \
 		$(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+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 \
@@ -145,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[=:]'