X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.in;h=aaef27c36d943dce9adbdd54f21a56897a22a69b;hp=4f6799bbef33ba53e80db1d37941b8d559d186d0;hb=8dea1e97637d64ca1bd59251720e1c790237c8a8;hpb=420f3633557ed75a0de989eb065af6e09eed29ba

diff --git a/Makefile.in b/Makefile.in
index 4f6799b..aaef27c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,6 @@ GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-HAVE_LIB = @HAVE_LIB@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -83,11 +82,9 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 ISPELL = @ISPELL@
 KRB5CFGPATH = @KRB5CFGPATH@
-LIB = @LIB@
 LIBICONV = @LIBICONV@
 LIBIMAP = @LIBIMAP@
 LIBIMAPDEPS = @LIBIMAPDEPS@
-LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -110,19 +107,19 @@ docdir = @docdir@
 mutt_libesmtp_config_path = @mutt_libesmtp_config_path@
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
+EXTRA_PROGRAMS = muttng_dotlock pgpring makedoc
 
 @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
 
 SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
 
-bin_SCRIPTS = muttbug flea
+bin_SCRIPTS = muttngbug fleang
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-muttng_SOURCES = $(BUILT_SOURCES) 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c 	compress.c crypt.c cryptglue.c 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c 	postpone.c query.c recvattach.c recvcmd.c 	rfc822.c rfc1524.c rfc2047.c rfc2231.c 	score.c send.c sendlib.c signal.c sort.c 	status.c system.c thread.c charset.c history.c lib.c 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c 	url.c ascii.c mutt_idna.c sidebar.c
+muttng_SOURCES = $(BUILT_SOURCES) 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c 	compress.c crypt.c cryptglue.c 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c 	postpone.c query.c recvattach.c recvcmd.c 	rfc822.c rfc1524.c rfc2047.c rfc2231.c 	score.c send.c sendlib.c signal.c sort.c 	status.c system.c thread.c charset.c history.c lib.c 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c 	url.c ascii.c mutt_idna.c sidebar.c hcache.c
 
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) 	$(INTLLIBS) $(LIBICONV)
@@ -154,12 +151,12 @@ CPPFLAGS = @CPPFLAGS@ -I$(includedir)
 EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c 	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c 	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c 	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c 	pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c 	sidebar.h
 
 
-EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO 	configure acconfig.h account.h 	compress.h 	attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs 	globals.h hash.h history.h init.h keymap.h mutt_crypt.h 	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h 	mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h 	mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h 	rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare 	nntp.h ChangeLog.nntp 	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h 	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc 	makedoc.c stamp-doc-rc README.SSL smime.h 	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh		ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h 	snprintf.c regex.c mutt_libesmtp.h
+EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO 	configure acconfig.h account.h 	compress.h 	attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs 	globals.h hash.h history.h init.h keymap.h mutt_crypt.h 	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h 	mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h 	mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h 	rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare 	nntp.h ChangeLog.nntp 	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h 	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc 	makedoc.c stamp-doc-rc README.SSL smime.h 	muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh		ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h 	snprintf.c regex.c mutt_libesmtp.h
 
 
-mutt_dotlock_SOURCES = mutt_dotlock.c
-mutt_dotlock_LDADD = @LIBOBJS@
-mutt_dotlock_DEPENDENCIES = @LIBOBJS@
+muttng_dotlock_SOURCES = mutt_dotlock.c
+muttng_dotlock_LDADD = @LIBOBJS@
+muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
 pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
 pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
@@ -176,13 +173,13 @@ OPS = @OPS@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  muttbug.sh Muttrc.head
+CONFIG_CLEAN_FILES =  muttbug.sh Muttngrc.head
 PROGRAMS =  $(bin_PROGRAMS)
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-mutt_dotlock_OBJECTS =  mutt_dotlock.o
-mutt_dotlock_LDFLAGS = 
+muttng_dotlock_OBJECTS =  mutt_dotlock.o
+muttng_dotlock_LDFLAGS = 
 pgpring_OBJECTS =  pgppubring.o pgplib.o lib.o extlib.o sha1.o md5c.o \
 pgppacket.o ascii.o
 pgpring_LDFLAGS = 
@@ -197,7 +194,7 @@ mx.o pager.o parse.o pattern.o postpone.o query.o recvattach.o \
 recvcmd.o rfc822.o rfc1524.o rfc2047.o rfc2231.o score.o send.o \
 sendlib.o signal.o sort.o status.o system.o thread.o charset.o \
 history.o lib.o muttlib.o editmsg.o utf8.o mbyte.o wcwidth.o url.o \
-ascii.o mutt_idna.o sidebar.o
+ascii.o mutt_idna.o sidebar.o hcache.o
 muttng_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
@@ -206,9 +203,9 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README ./stamp-h.in ABOUT-NLS ChangeLog INSTALL \
-Makefile.am Makefile.in Muttrc.head.in NEWS TODO acconfig.h aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in install-sh \
-missing mkinstalldirs muttbug.sh.in strcasecmp.c strdup.c
+Makefile.am Makefile.in Muttngrc.head.in NEWS TODO acconfig.h \
+aclocal.m4 config.guess config.h.in config.sub configure configure.in \
+install-sh missing mkinstalldirs muttbug.sh.in strcasecmp.c strdup.c
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -216,8 +213,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = tar
 GZIP_ENV = --best
 DIST_SUBDIRS =  m4 po intl doc contrib imap
-SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES)
-OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(muttng_OBJECTS)
+SOURCES = $(muttng_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES)
+OBJECTS = $(muttng_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(muttng_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -268,7 +265,7 @@ distclean-hdr:
 maintainer-clean-hdr:
 muttbug.sh: $(top_builddir)/config.status muttbug.sh.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-Muttrc.head: $(top_builddir)/config.status Muttrc.head.in
+Muttngrc.head: $(top_builddir)/config.status Muttngrc.head.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-binPROGRAMS:
@@ -315,9 +312,9 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-mutt_dotlock: $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES)
-	@rm -f mutt_dotlock
-	$(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS)
+muttng_dotlock: $(muttng_dotlock_OBJECTS) $(muttng_dotlock_DEPENDENCIES)
+	@rm -f muttng_dotlock
+	$(LINK) $(muttng_dotlock_LDFLAGS) $(muttng_dotlock_OBJECTS) $(muttng_dotlock_LDADD) $(LIBS)
 
 pgpring: $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES)
 	@rm -f pgpring
@@ -589,9 +586,9 @@ mostlyclean distclean maintainer-clean
 mutt_dotlock.c: dotlock.c
 	cp $(srcdir)/dotlock.c mutt_dotlock.c
 
-flea:	muttbug.sh
-	cp muttbug.sh flea
-	chmod +x flea
+fleang:	muttbug.sh
+	cp muttbug.sh fleang
+	chmod +x fleang
 
 smime_keys: $(srcdir)/smime_keys.pl
 	cp $(srcdir)/smime_keys.pl smime_keys
@@ -614,14 +611,14 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 
 install-exec-local:
-	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
+	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then	\
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
-		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+		ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 	fi
-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+	if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
+		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \
+		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \
+		{ echo "Can't fix muttng_dotlock's permissions!" >&2 ; exit 1 ; } \
 	fi
 
 install-data-local: Muttngrc
@@ -672,12 +669,12 @@ mutt-dist:
 update-doc: stamp-doc-rc
 	(cd doc && $(MAKE) update-doc)
 
-Muttrc: stamp-doc-rc
+Muttngrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
-	-rm -f Muttrc stamp-doc-rc
+stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
+	-rm -f Muttngrc stamp-doc-rc
 	$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-		$(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
+		$(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc
 	touch stamp-doc-rc
 
 .PHONY: commit pclean check-security commit-real commit-changelog