X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.in;h=19f47b492e534e3aa67763ca8b128b3899b3a1b2;hp=bf9ac50360896188ff6cd7491d99a4d622895cca;hb=4ca1867975c2c1f247557d4f33ea6ca6dbe9eae0;hpb=a079d019ec8e6f0be0decaafc9e914bc842f9983

diff --git a/Makefile.in b/Makefile.in
index bf9ac50..19f47b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,8 +139,6 @@ SMIMEAUX_TARGET = @SMIMEAUX_TARGET@
 STRIP = @STRIP@
 SUBVERSION = @SUBVERSION@
 U = @U@
-USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
-USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
 USE_GSS_FALSE = @USE_GSS_FALSE@
 USE_GSS_TRUE = @USE_GSS_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
@@ -191,7 +189,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = muttng_dotlock pgpring makedoc
+EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
 
 @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
@@ -262,9 +260,13 @@ 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) 
-pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) 
+pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+
+pgpewrapng_SOURCES = pgpewrap.c
+pgpewrapng_LDADD = 
+pgpewrapng_DEPENDENCIES = 
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
 	keymap_alldefs.h keymap_defs.h patchlist.c
@@ -279,8 +281,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \
 	muttbug.sh Muttngrc.head doc/instdoc.sh
-EXTRA_PROGRAMS = muttng_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-	makedoc$(EXEEXT)
+EXTRA_PROGRAMS = muttng_dotlock$(EXEEXT) pgpringng$(EXEEXT) \
+	pgpewrapng$(EXEEXT) makedoc$(EXEEXT)
 bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
 	@SMIMEAUX_TARGET@
 PROGRAMS = $(bin_PROGRAMS)
@@ -317,11 +319,14 @@ muttng_LDFLAGS =
 am_muttng_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
 muttng_dotlock_OBJECTS = $(am_muttng_dotlock_OBJECTS)
 muttng_dotlock_LDFLAGS =
-am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) lib.$(OBJEXT) \
-	extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
+am_pgpewrapng_OBJECTS = pgpewrap.$(OBJEXT)
+pgpewrapng_OBJECTS = $(am_pgpewrapng_OBJECTS)
+pgpewrapng_LDFLAGS =
+am_pgpringng_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
+	lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
 	pgppacket.$(OBJEXT) ascii.$(OBJEXT)
-pgpring_OBJECTS = $(am_pgpring_OBJECTS)
-pgpring_LDFLAGS =
+pgpringng_OBJECTS = $(am_pgpringng_OBJECTS)
+pgpringng_LDFLAGS =
 SCRIPTS = $(bin_SCRIPTS)
 
 
@@ -334,7 +339,7 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(makedoc_SOURCES) $(muttng_SOURCES) \
 	$(EXTRA_muttng_SOURCES) $(muttng_dotlock_SOURCES) \
-	$(pgpring_SOURCES)
+	$(pgpewrapng_SOURCES) $(pgpringng_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
@@ -347,7 +352,7 @@ DIST_COMMON = README ABOUT-NLS ChangeLog INSTALL Makefile.am \
 	depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \
 	snprintf.c strcasecmp.c strdup.c
 DIST_SUBDIRS = m4 po intl doc contrib imap
-SOURCES = $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(muttng_dotlock_SOURCES) $(pgpring_SOURCES)
+SOURCES = $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(muttng_dotlock_SOURCES) $(pgpewrapng_SOURCES) $(pgpringng_SOURCES)
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -430,9 +435,12 @@ muttng$(EXEEXT): $(muttng_OBJECTS) $(muttng_DEPENDENCIES)
 muttng_dotlock$(EXEEXT): $(muttng_dotlock_OBJECTS) $(muttng_dotlock_DEPENDENCIES) 
 	@rm -f muttng_dotlock$(EXEEXT)
 	$(LINK) $(muttng_dotlock_LDFLAGS) $(muttng_dotlock_OBJECTS) $(muttng_dotlock_LDADD) $(LIBS)
-pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) 
-	@rm -f pgpring$(EXEEXT)
-	$(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS)
+pgpewrapng$(EXEEXT): $(pgpewrapng_OBJECTS) $(pgpewrapng_DEPENDENCIES) 
+	@rm -f pgpewrapng$(EXEEXT)
+	$(LINK) $(pgpewrapng_LDFLAGS) $(pgpewrapng_OBJECTS) $(pgpewrapng_LDADD) $(LIBS)
+pgpringng$(EXEEXT): $(pgpringng_OBJECTS) $(pgpringng_DEPENDENCIES) 
+	@rm -f pgpringng$(EXEEXT)
+	$(LINK) $(pgpringng_LDFLAGS) $(pgpringng_OBJECTS) $(pgpringng_LDADD) $(LIBS)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -833,9 +841,9 @@ fleang:	muttbug.sh
 	cp muttbug.sh fleang
 	chmod +x fleang
 
-smime_keys: $(srcdir)/smime_keys.pl
-	cp $(srcdir)/smime_keys.pl smime_keys
-	chmod +x smime_keys
+smime_keysng: $(srcdir)/smime_keys.pl
+	cp $(srcdir)/smime_keys.pl smime_keysng
+	chmod +x smime_keysng
 
 Makefile: $(BUILT_SOURCES)
 
@@ -874,7 +882,7 @@ install-data-local: Muttngrc
 		$(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
 	fi
 	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
 	fi
 
 # Don't make this one ChangeLog - it's intended to be