X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=4330ce2348c4b28bf040dd9f6d9a6ef9649dd534;hp=8bc28642a5d76aeb46f8a0c903080aa6ad7d87e2;hb=2dc50decd320b310ef56c14041b6fa4fefd865ac;hpb=86c5af6b888685ff4337090e37ba72ad040df965

diff --git a/Makefile.am b/Makefile.am
index 8bc2864..4330ce2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,11 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-	  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-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
@@ -21,23 +21,35 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 	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 \
-	score.c send.c sendlib.c sort.c state.c thread.c account.c
+	score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-	       -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
-	       -Limap -limap -Lpop -lpop $(LIBNNTP) \
-	       -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \
-	       $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
-
-madmutt_DEPENDENCIES = @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 \
+		$(LIBNNTP) \
+		$(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@ \
 		       $(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 \
 		       \
-		       $(top_builddir)/pop/libpop.a  \
+		       $(top_builddir)/pop/libpop.a   \
 		       $(top_builddir)/imap/libimap.a \
 		       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -60,7 +72,7 @@ EXTRA_madmutt_SOURCES = \
 	alias.h browser.h remailer.h state.h \
 	mutt_idna.h mutt_libesmtp.c state.h
 
-EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.MIX TODO \
+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 \
 	recvattach.h handler.h thread.h globals.h init.h keymap.h \
@@ -84,15 +96,12 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc \
-	keymap_alldefs.h keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
 LDADD = @LIBOBJS@ @LIBINTL@
 
-OPS=@OPS@
-
 charset.gperf: charset.def
 	sh $< > $@
 
@@ -100,17 +109,9 @@ smime_keysng: $(srcdir)/smime_keys.pl
 	cp $(srcdir)/smime_keys.pl smime_keysng
 	chmod +x smime_keysng
 
-Makefile: $(BUILT_SOURCES)
-
-keymap_defs.h: $(OPS)
+keymap_defs.h: OPS
 	$(srcdir)/gen_defs $^ > keymap_defs.h
 
-keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.MIX
-	$(srcdir)/gen_defs $^ > keymap_alldefs.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 ;		\
@@ -122,41 +123,33 @@ install-exec-hook:
 		{ echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \
 	fi
 
-install-data-local: madmuttrc
+install-data-local: Madmuttrc
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-	-if [ -f $(DESTDIR)$(pkgdatadir)/madmuttrc ] ; then \
-		mv $(DESTDIR)$(pkgdatadir)/madmuttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ -f $(DESTDIR)$(pkgdatadir)/../madmuttrc ] ; then \
-	 	mv $(DESTDIR)$(pkgdatadir)/../madmuttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ ! -f $(DESTDIR)$(sysconfdir)/madmuttrc ] ; then \
-		$(INSTALL) -m 644 madmuttrc $(DESTDIR)$(sysconfdir) ; \
+	-if [ -f $(DESTDIR)$(pkgdatadir)/Madmuttrc ] ; then \
+		mv $(DESTDIR)$(pkgdatadir)/Madmuttrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ -f $(DESTDIR)$(pkgdatadir)/../Madmuttrc ] ; then \
+	 	mv $(DESTDIR)$(pkgdatadir)/../Madmuttrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ ! -f $(DESTDIR)$(sysconfdir)/Madmuttrc ] ; then \
+		$(INSTALL) -m 644 Madmuttrc $(DESTDIR)$(sysconfdir) ; \
 	fi
 	-if [ ! -f $(DESTDIR)$(sysconfdir)/madmutt-mime.types ]; then \
 		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/madmutt-mime.types; \
 	fi
 
 
-# kluge around automake problems.
-
-dist-hook:
-	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
-mutt-dist:
-	(cd $(srcdir) && ./build-release )
-
 update-doc: stamp-doc-rc
 	(cd doc && $(MAKE) update-doc)
 
-madmuttrc: stamp-doc-rc
+Madmuttrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head
-	-rm -f madmuttrc stamp-doc-rc
+stamp-doc-rc: $(srcdir)/init.h makedoc Madmuttrc.head
+	-rm -f Madmuttrc stamp-doc-rc
 	$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-		$(srcdir)/init.h | ./makedoc -c | cat madmuttrc.head - > madmuttrc
-	touch stamp-doc-rc
-
+		$(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[=:]'