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

diff --git a/Makefile.am b/Makefile.am
index 65c1bee..2e155df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,34 +2,29 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
-
-.cpkg.c:  ; ./lib-lua/luapkg2c.pl -c $< > $@
-.cpkg.li: ; ./lib-lua/luapkg2c.pl -h $< > $@
-
+EXTRA_PROGRAMS = madmutt_dotlock makedoc
 
 if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
-	  lib-lua 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-hash lib-sys lib-ui \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h charset.gperf
 DISTCLEANFILES = $(BUILT_SOURCES)
 
-bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
+bin_PROGRAMS = madmutt madmutt_dotlock smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
-	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 \
+	alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
+	compose.c copy.c crypt.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 \
 	score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c
 
 madmutt_LDADD = @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 \
@@ -41,13 +36,13 @@ 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 \
-		       $(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 \
@@ -77,28 +72,17 @@ EXTRA_madmutt_SOURCES = \
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS TODO \
 	configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-	buffy.h charset.h copy.h dotlock.h functions.def gen_defs \
+	buffy.h charset.h copy.h crypt.c dotlock.h functions.def gen_defs \
 	recvattach.h handler.h thread.h globals.h init.h keymap.h \
 	mime.h mutt.h mutt_sasl.h pager.h protos.h \
 	sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \
-	lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \
+	lib.h smime_keys.pl Madmuttrc.head Madmuttrc \
 	makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
 madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
 
-pgpringng_SOURCES = pgppubring.c lib.c extlib.c
-pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
-		  -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt
-pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
-			 $(top_builddir)/lib-lib/liblib.a \
-			 $(top_builddir)/lib-hash/libhash.a
-
-pgpewrapng_SOURCES = pgpewrap.c
-pgpewrapng_LDADD = 
-pgpewrapng_DEPENDENCIES = 
-
 CLEANFILES = stamp-doc-rc makedoc keymap_defs.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
@@ -151,7 +135,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[=:]'