X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/75263f25a1ce8e7b38ad4bd61a9a893723ec1db3..5ff5e6589e2b702516cb11c37e91ed69ad4eae8a:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index bd4be03..1be844e 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
-## -*-makefile-*-
+## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.58 2002/10/19 17:56:50 mdw Exp $
+## $Id: Makefile.m4,v 1.64 2003/11/10 22:18:30 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,24 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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'.
+##
+## Revision 1.59  2003/05/16 00:54:50  mdw
+## Install pixie to fake root if wanted.  Ship `desx-tab.h'
+##
 ## Revision 1.58  2002/10/19 17:56:50  mdw
 ## Fix bit operations.  Test them (a bit) better.
 ##
@@ -273,7 +291,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
@@ -282,7 +301,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 \
@@ -295,12 +315,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 \
@@ -327,7 +347,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',
@@ -356,6 +376,9 @@ libcatacomb_la_SOURCES = \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
 	des-base.c des-base.h \
+	desx-tab.h \
+	rc2-tab.h \
+	skipjack-tab.h \
 	cast-s.c cast-sk.c cast-base.h cast-tab.h \
 	rijndael-base.c rijndael-base.h \
 	md2-tab.h \
@@ -420,7 +443,7 @@ mptypes_LDADD =
 changequote(<, >)
 install: install-exec-hook
 install-exec-hook:
-	@pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
+	@pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \
 	if chown root $$pixie && chmod 4755 $$pixie; then \
 	  echo "chown root $$pixie"; \
 	  echo "chmod 4755 $$pixie"; \
@@ -515,7 +538,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