X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b2524d68efdcf16f3f7340da16094f17826c7b95..dcec124d5962050d845e59ce63bcde840f215a4b:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index f495b6f..c191886 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
@@ -164,7 +162,7 @@ BUILT_SOURCES = \
 lib_LTLIBRARIES = libcatacomb.la
 
 libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
-libcatacomb_la_LDFLAGS = -version-info 3:1:1
+libcatacomb_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO)
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -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 \
@@ -304,10 +303,12 @@ hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
+perftest_LDADD = $(CATACOMB_LIBS) $(LDADD)
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
 pixie_LDADD = $(PIXIE_LIBS)
 pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
+mkphrase_LDADD = $(CATACOMB_LIBS) $(LDADD)
 bittest_SOURCES = bittest.c
 bittest_LDADD =
 
@@ -363,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
@@ -374,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 \
@@ -385,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; \
@@ -469,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')