jcs.org / mutt
mutt stable branch with some hacks
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Long-overdue build system overhaul.

Matthias Andree 8a20f98c 9e029aa6

+77 -171
+18 -7
Makefile.am
··· 18 18 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ 19 19 mutt_SOURCES = $(BUILT_SOURCES) \ 20 20 addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ 21 - crypt.c cryptglue.c \ 21 + crypt.c cryptglue.c \ 22 22 commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ 23 23 edit.c enter.c flags.c init.c filter.c from.c \ 24 24 getdomain.c group.c \ ··· 42 42 makedoc_DEPENDENCIES = 43 43 44 44 # $(makedoc_OBJECTS): $(makedoc_SOURCES) 45 - # $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $< 45 + # $(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $< 46 46 47 47 # makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 48 48 # @rm -rf makedoc ··· 54 54 -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \ 55 55 -DHAVE_CONFIG_H=1 56 56 57 - INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl 57 + AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl 58 58 59 59 CPPFLAGS=@CPPFLAGS@ -I$(includedir) 60 60 ··· 99 99 keymap_alldefs.h keymap_defs.h patchlist.c \ 100 100 reldate.h 101 101 102 + DISTCLEANFILES= flea Muttrc smime_keys 103 + 102 104 ACLOCAL_AMFLAGS = -I m4 103 105 104 106 LDADD = @LIBOBJS@ @INTLLIBS@ ··· 113 115 cp $(srcdir)/smime_keys.pl smime_keys 114 116 chmod +x smime_keys 115 117 116 - Makefile: $(BUILT_SOURCES) 117 - 118 118 keymap_defs.h: $(OPS) $(srcdir)/gen_defs 119 119 $(srcdir)/gen_defs $(OPS) > keymap_defs.h 120 120 121 - keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs 121 + $(srcdir)/keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs 122 + chmod u+w $(srcdir) 123 + rm -f $@ 122 124 $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \ 123 125 $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \ 124 126 > $(srcdir)/keymap_alldefs.h ··· 142 144 143 145 install-data-local: Muttrc 144 146 $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) 147 + $(INSTALL) -m644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist 148 + $(INSTALL) -m644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist 145 149 -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ 146 150 mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ 147 151 elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \ ··· 153 157 $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \ 154 158 fi 155 159 160 + uninstall-local: 161 + for i in Muttrc mime.types ; do \ 162 + if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \ 163 + rm $(DESTDIR)$(sysconfdir)/$$i ; \ 164 + fi ; \ 165 + rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \ 166 + done 156 167 157 168 # Don't make this one ChangeLog - it's intended to be 158 169 # used manually. ··· 192 203 193 204 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head 194 205 -rm -f Muttrc stamp-doc-rc 195 - $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ 206 + $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ 196 207 $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc 197 208 touch stamp-doc-rc 198 209
-1
build-release
··· 50 50 51 51 # now, prepare the distribution tar balls 52 52 53 - (cd m4 && rm -f Makefile Makefile.in Makefile.am && make -f Makefile.am.in) 54 53 automake 55 54 touch configure.in 56 55 make config.status
+1
contrib/.cvsignore
··· 1 1 Makefile 2 + Makefile.in
+39
contrib/Makefile.am
··· 1 + # $Id$ 2 + 3 + subdir = contrib 4 + 5 + SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ 6 + sample.muttrc sample.mailcap sample.muttrc-tlr \ 7 + colors.default colors.linux smime.rc \ 8 + ca-bundle.crt smime_keys_test.pl 9 + 10 + EXTRA_DIST = language.txt language50.txt \ 11 + patch.slang-1.2.2.keypad.1 \ 12 + $(SAMPLES) \ 13 + iconv/README \ 14 + iconv/make.sh 15 + 16 + install-data-local: 17 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv 18 + for f in $(SAMPLES) ; do \ 19 + $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ 20 + done 21 + for f in $(srcdir)/iconv/*.rc ; do \ 22 + $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ 23 + done 24 + 25 + uninstall-local: 26 + for f in $(SAMPLES) ; do \ 27 + rm -f $(DESTDIR)$(docdir)/samples/$$f ; \ 28 + done 29 + -rm -rf $(DESTDIR)$(docdir)/samples/iconv 30 + -rmdir $(DESTDIR)$(docdir)/samples 31 + -rmdir $(DESTDIR)$(docdir) 32 + 33 + distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) 34 + dist-hook: Makefile $(DISTFILES) 35 + mkdir -p $(distdir)/iconv 36 + for file in $(srcdir)/iconv/*.rc ; do \ 37 + ln $$file $(distdir)/iconv 2> /dev/null \ 38 + || cp -p $$file $(distdir)/iconv ; \ 39 + done
-79
contrib/Makefile.in
··· 1 - # $Id$ 2 - 3 - SHELL = /bin/sh 4 - 5 - PACKAGE = @PACKAGE@ 6 - VERSION = @VERSION@ 7 - 8 - prefix = @prefix@ 9 - exec_prefix = @exec_prefix@ 10 - bindir = @bindir@ 11 - libdir = @libdir@ 12 - datarootdir = @datarootdir@ 13 - mandir = @mandir@ 14 - srcdir = @srcdir@ 15 - docdir = @docdir@ 16 - top_srcdir = @top_srcdir@ 17 - top_builddir = .. 18 - INSTALL = @INSTALL@ 19 - VPATH = @srcdir@ 20 - @SET_MAKE@ 21 - 22 - subdir = contrib 23 - 24 - SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ 25 - sample.muttrc sample.mailcap sample.muttrc-tlr \ 26 - colors.default colors.linux smime.rc \ 27 - ca-bundle.crt smime_keys_test.pl 28 - 29 - DISTFILES = Makefile.in language.txt language50.txt \ 30 - patch.slang-1.2.2.keypad.1 \ 31 - $(SAMPLES) 32 - 33 - ICONV_DISTFILES = README make.sh 34 - 35 - all clean: 36 - 37 - distclean: 38 - -rm -f Makefile 39 - 40 - check: 41 - 42 - install: 43 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv 44 - for f in $(SAMPLES) ; do \ 45 - $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ 46 - done 47 - for f in $(srcdir)/iconv/*.rc ; do \ 48 - $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ 49 - done 50 - 51 - uninstall: 52 - for f in $(SAMPLES) ; do \ 53 - rm -f $(DESTDIR)$(docdir)/samples/$$f ; \ 54 - done 55 - -rm -rf $(DESTDIR)$(docdir)/samples/iconv 56 - -rmdir $(DESTDIR)$(docdir)/samples 57 - -rmdir $(DESTDIR)$(docdir) 58 - 59 - maintainer-clean: distclean 60 - 61 - Makefile: ../config.status Makefile.in 62 - cd .. \ 63 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status 64 - 65 - distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) 66 - dist distdir: Makefile $(DISTFILES) 67 - for file in $(DISTFILES) ; do \ 68 - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ 69 - || cp -p $(srcdir)/$$file $(distdir); \ 70 - done 71 - mkdir -p $(distdir)/iconv 72 - for file in $(ICONV_DISTFILES) ; do \ 73 - ln $(srcdir)/iconv/$$file $(distdir)/iconv 2> /dev/null \ 74 - || cp -p $(srcdir)/iconv/$$file $(distdir)/iconv; \ 75 - done 76 - for file in $(srcdir)/iconv/*.rc ; do \ 77 - ln $$file $(distdir)/iconv 2> /dev/null \ 78 - || cp -p $$file $(distdir)/iconv ; \ 79 - done
+1
doc/.cvsignore
··· 1 1 Makefile 2 + Makefile.in 2 3 *.html 3 4 muttrc.man 4 5 mutt.1
+8 -63
doc/Makefile.in doc/Makefile.am
··· 1 1 # $Id$ 2 2 3 - SHELL = /bin/sh 4 - 5 - PACKAGE = @PACKAGE@ 6 - VERSION = @VERSION@ 7 - 8 - prefix = @prefix@ 9 - exec_prefix = @exec_prefix@ 10 - datarootdir = @datarootdir@ 11 - sysconfdir = @sysconfdir@ 12 - bindir = @bindir@ 13 - libdir = @libdir@ 14 - mandir = @mandir@ 15 - srcdir = @srcdir@ 16 - docdir = @docdir@ 17 - includedir = @includedir@ 18 - top_srcdir=@top_srcdir@ 19 - top_builddir = .. 20 - VPATH = @srcdir@ 21 - @SET_MAKE@ 22 - 23 - INSTALL = @INSTALL@ 24 - CC = @CC@ 25 - CPP = @CPP@ 26 - EXEEXT = @EXEEXT@ 27 - XCPPFLAGS = -I. @CPPFLAGS@ 28 - CFLAGS = @CFLAGS@ $(XCPPFLAGS) 29 - LDFLAGS = @LDFLAGS@ 30 3 subdir = doc 31 4 32 - CPPFLAGS = @CPPFLAGS@ 33 - 34 5 DSLROOT = @DSLROOT@ 35 6 36 7 DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1 37 - INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir) 8 + AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir) 38 9 39 - MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 10 + MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 40 11 41 - DISTFILES = Makefile.in dotlock.man \ 12 + EXTRA_DIST = dotlock.man \ 42 13 muttbug.man \ 43 14 mutt.man \ 44 15 PGP-Notes.txt \ ··· 53 24 instdoc.sh.in \ 54 25 patch-notes.txt \ 55 26 smime-notes.txt \ 56 - html.xsl chunk.xsl 27 + html.xsl chunk.xsl $(BUILT_DISTFILES) 57 28 58 29 HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ 59 30 configuration.html mimesupport.html advancedusage.html \ ··· 73 44 74 45 makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt 75 46 76 - install: makedoc-all instdoc 47 + install-data-local: makedoc-all instdoc 77 48 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 78 49 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 79 50 ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 ··· 96 67 $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ 97 68 done 98 69 99 - uninstall: 70 + uninstall-local: 100 71 for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ 101 72 rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ 102 73 done ··· 128 99 openjade -t tex -D $(DSLROOT) -d print/docbook.dsl dtds/decls/xml.dcl manual.xml; \ 129 100 fi 130 101 131 - clean: 102 + clean-local: 132 103 rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man 133 104 rm -f *.aux *.log *.tex *.out 134 105 135 - clean-real: 136 - rm -f manual.txt manual.html manual.xml manual.pdf 137 - rm -rf html 138 - 139 - maintainer-clean: clean clean-real distclean 140 - 141 - distclean: clean 142 - rm -f Makefile 143 - 144 - Makefile: Makefile.in ../config.status 145 - cd .. \ 146 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status 106 + DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html instdoc 147 107 148 108 instdoc: instdoc.sh 149 109 cat instdoc.sh > instdoc 150 110 chmod a+x instdoc 151 - 152 - instdoc.sh: instdoc.sh.in ../config.status 153 - cd .. \ 154 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status 155 - 156 - distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) 157 - dist distdir: Makefile $(DISTFILES) 158 - for file in $(DISTFILES) ; do \ 159 - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ 160 - || cp -p $(srcdir)/$$file $(distdir); \ 161 - done 162 - for file in $(BUILT_DISTFILES) ; do \ 163 - ln $$file $(distdir) 2> /dev/null \ 164 - || cp -p $$file $(distdir) ; \ 165 - done 166 111 167 112 ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c 168 113 (cd .. && $(MAKE) makedoc$(EXEEXT))
+1 -1
imap/Makefile.am
··· 16 16 17 17 EXTRA_DIST = BUGS README TODO auth_anon.c auth_cram.c auth_gss.c auth_sasl.c 18 18 19 - INCLUDES = -I$(top_srcdir) -I../intl 19 + AM_CPPFLAGS = -I$(top_srcdir) -I../intl 20 20 21 21 noinst_LIBRARIES = libimap.a 22 22 noinst_HEADERS = auth.h imap_private.h message.h
+6
m4/Makefile.am
··· 1 + EXTRA_DIST = README 2 + 3 + dist-hook: 4 + for i in $(srcdir)/*.m4 ; do \ 5 + echo cp -p $$i $(distdir) ; \ 6 + done
-15
m4/Makefile.am.in
··· 1 - ## Process this file with automake to produce Makefile.in -*-Makefile-*- 2 - 3 - ##m4-files-begin 4 - ##m4-files-end 5 - 6 - Makefile.am: Makefile.am.in 7 - rm -f $@ $@t 8 - sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t 9 - ( (echo EXTRA_DIST = README Makefile.am.in | tr '\012' @); \ 10 - (echo *.m4|tr ' ' @) ) \ 11 - |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \ 12 - >> $@t 13 - sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t 14 - chmod a-w $@t 15 - mv $@t $@
-4
m4/README
··· 2 2 package). aclocal uses these files to create aclocal.m4 which is in turn 3 3 used by autoconf to create the configure script at the the top level in 4 4 this distribution. 5 - 6 - The Makefile.am file in this directory is automatically generated 7 - from the template file, Makefile.am.in. 8 -
+2
po/Makefile.in.in
··· 86 86 # have been downloaded. 87 87 88 88 $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in 89 + chmod u+w $(srcdir) 90 + rm -f $@ 89 91 $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ 90 92 --add-comments --keyword=_ --keyword=N_ \ 91 93 --files-from=$(srcdir)/POTFILES.in \
+1 -1
prepare
··· 7 7 include_deps="-i" 8 8 fi 9 9 10 - if aclocal -I m4 && autoheader && (cd m4 && make -f Makefile.am.in ) \ 10 + if aclocal -I m4 && autoheader \ 11 11 && automake $include_deps && autoconf && ./configure "$@" 12 12 then 13 13 echo