X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=7b375e0dee4241b9fb469569623e7da7ab5b60c5;hp=22c1888e1898ef029e94405c25e38d96e4133e24;hb=627215940cb13e74999ab56375dbb615e22f23bd;hpb=61c6367b9a56cf1b8180debf8a77af7300407504

diff --git a/Makefile.am b/Makefile.am
index 22c1888..7b375e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ 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 = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
+	  lib-mime lib-lib lib-lua lib-mx lib-crypt lib-hash lib-sys lib-ui \
 	  pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h charset.gperf
@@ -24,10 +24,18 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 	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)
+		$(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 \
@@ -35,9 +43,10 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 		       $(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  \
+		       $(top_builddir)/pop/libpop.a   \
 		       $(top_builddir)/imap/libimap.a \
 		       $(LIBNNTPDEPS) $(INTLDEPS)
 
@@ -84,7 +93,7 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -97,8 +106,6 @@ smime_keysng: $(srcdir)/smime_keys.pl
 	cp $(srcdir)/smime_keys.pl smime_keysng
 	chmod +x smime_keysng
 
-Makefile: $(BUILT_SOURCES)
-
 keymap_defs.h: OPS
 	$(srcdir)/gen_defs $^ > keymap_defs.h
 
@@ -116,38 +123,30 @@ 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