Keep quiet about expected errors on incoming connections.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index f2422f1..4428442 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
-## -*-makefile-*-
+## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.60 2003/05/16 01:12:37 mdw Exp $
+## $Id: Makefile.m4,v 1.65 2003/11/29 23:39:36 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,21 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.65  2003/11/29 23:39:36  mdw
+## Debianization.
+##
+## Revision 1.64  2003/11/10 22:18:30  mdw
+## Build fixes.
+##
+## Revision 1.63  2003/10/17 16:30:46  mdw
+## Report errors if key files don't exist!
+##
+## Revision 1.62  2003/10/12 15:02:09  mdw
+## Reliability fixes.
+##
+## Revision 1.61  2003/10/11 21:02:33  mdw
+## Import buf stuff from tripe.
+##
 ## Revision 1.60  2003/05/16 01:12:37  mdw
 ## Ship `rc2-tab.h' and `skipjack-tab.h'.
 ##
@@ -279,7 +294,8 @@ _(gfshare) _(gfx-sqr)')
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
 _item`'-tab.h: _item`'-mktab
-       ./_item`'-mktab >_item`'-tab.h')dnl
+       ./_item`'-mktab >_item`'-tab.h.new
+       mv _item`'-tab.h.new _item`'-tab.h')dnl
 gen_tables
 
 primetab.h: primetab.c
@@ -288,7 +304,8 @@ primetab.c: genprimes
                -t "unsigned short" -i primetab
 archinclude_HEADERS = mptypes.h
 mptypes.h: mptypes
-       ./mptypes >mptypes.h
+       ./mptypes >mptypes.h.new
+       mv mptypes.h.new mptypes.h
 
 BUILT_SOURCES = \
        getdate.c modes-stamp \
@@ -301,12 +318,12 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 2:0:0
+libcatacomb_la_LDFLAGS = -version-info 2:1:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
 pkginclude_HEADERS = \
-       arena.h paranoia.h \
+       arena.h paranoia.h buf.h \
        blkc.h hash.h gcipher.h ghash.h gmac.h grand.h ghash-def.h \
        lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \
        key.h key-data.h passphrase.h pixie.h lmem.h \
@@ -333,7 +350,7 @@ define(`MP_SOURCES',
        exp.c mpcrt.c mpmul.c mprand.c \
        mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
        mpmont.c mpmont-mexp.c mpmont-exp.h \
-       rho.c \
+       rho.c buf.c \
        GF_SOURCES PGEN_SOURCES')
 
 define(`GF_SOURCES',
@@ -448,7 +465,10 @@ man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 
 EXTRA_DIST = \
        Makefile.m4 genmodes $(man_MANS) xpixie \
-       README.cipher README.hash README.random README.mp
+       README.cipher README.hash README.random README.mp \
+       debian/rules debian/copyright debian/control debian/changelog \
+       debian/catacomb-bin.postinst debian/catacomb-bin.config \
+       debian/catacomb-bin.prerm debian/catacomb-bin.templates
 
 dist-hook:
        @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
@@ -524,7 +544,8 @@ CLEANFILES = \
 ## --- Makefile building (haha!) ---
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4
-       m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am
+       m4 $(srcdir)/Makefile.m4 >$(srcdir)/Makefile.am.new
+       mv $(srcdir)/Makefile.am.new $(srcdir)/Makefile.am
 
 DISTCLEANFILES = libtool