X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/5b7e2ea2181af13a916ea67203552c479d6b9c67..95ccefe3ce59a0773f915aca6948d5b6f1f7c882:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 6312e98..982cece 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -26,8 +26,6 @@
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ## MA 02111-1307, USA.
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = tests
 
 archincludedir = $(libdir)/catacomb/include
@@ -287,7 +285,8 @@ noinst_PROGRAMS = \
 LDADD = libcatcrypt.a libcatacomb.la
 
 define(`LIBCAT_SRC', `cc.h getdate.h dnl
-	cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
+	cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-hash.c \
+	cc-list.c cc-progress.c')
 libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
 
 patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
@@ -365,7 +364,7 @@ man_MANS = \
 
 ## --- Prime group keyring ---
 
-pkgdata_DATA = pgroups.kr
+#pkgdata_DATA = pgroups.kr
 
 $(srcdir)/pgroups.kr: ptab.in mkpgroups
 	cd $(srcdir) && rm -f pgroups.kr && ./mkpgroups <ptab.in
@@ -376,7 +375,7 @@ EXTRA_DIST = \
 	Makefile.m4 genmodes gengctab $(man_MANS) xpixie \
 	group-test.c rsa-test.c \
 	ectab.in ec-gentab.awk \
-	ptab.in p-gentab.awk mkpgroups pgroups.kr \
+	ptab.in p-gentab.awk mkpgroups \
 	bintab.in bin-gentab.awk \
 	README.cipher README.hash README.random README.mp \
 	debian/rules debian/copyright debian/control debian/changelog \
@@ -387,6 +386,7 @@ dist-hook:
 	@for i in getdate.c gciphertab.c ghashtab.c gmactab.c; do \
 	  ln $$i $(distdir) || ln $(srcdir)/$$i $(distdir) || true; \
 	done
+	echo $(VERSION) >$(distdir)/RELEASE
 	@echo datestamp >$(distdir)/modes-stamp || true
 	@for i in calc tests; do \
 	  mkdir $(distdir)/$$i; \
@@ -471,7 +471,8 @@ TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t$(EXEEXT) *.to *.kr.old \
-	mptypes.h primetab.c primetab.h wheel.c wheel.h \
+	mptypes.h mplimits.c mplimits.h \
+	primetab.c primetab.h wheel.c wheel.h \
 	ectab.c ptab.c bintab.c \
 	addsuffix(`gen_tables', `-tab.h')