X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/21aac40c87e498ae0a8c4c3d0960ca298a89b54c..d7f3f07d10ea7421546462f4d71c1f7455115d16:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index c462e0b..a1a6730 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -91,30 +91,30 @@ _(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
-_item`'-tab.h: _item`'-mktab
+_item`'-tab.h: _item`'-mktab$(EXEEXT)
 	./_item`'-mktab >_item`'-tab.h.new
 	mv _item`'-tab.h.new _item`'-tab.h')dnl
 gen_tables
 
 primetab.h: primetab.c
-primetab.c: genprimes
+primetab.c: genprimes$(EXEEXT)
 	./genprimes -h primetab.h -c primetab.c \
 		-s CATACOMB_PRIMETAB_H -n 256 \
 		-t "unsigned short" -i primetab
 archinclude_HEADERS = mptypes.h
-mptypes.h: mptypes
+mptypes.h: mptypes$(EXEEXT)
 	./mptypes >mptypes.h.new
 	mv mptypes.h.new mptypes.h
 
-ectab.c: ectab.in ec-gentab.awk mpdump
+ectab.c: ectab.in ec-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/ec-gentab.awk <$(srcdir)/ectab.in >ectab.c.new
 	mv ectab.c.new ectab.c
 
-ptab.c: ptab.in p-gentab.awk mpdump
+ptab.c: ptab.in p-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/p-gentab.awk <$(srcdir)/ptab.in >ptab.c.new
 	mv ptab.c.new ptab.c
 
-bintab.c: bintab.in bin-gentab.awk mpdump
+bintab.c: bintab.in bin-gentab.awk mpdump$(EXEEXT)
 	$(srcdir)/bin-gentab.awk <$(srcdir)/bintab.in >bintab.c.new
 	mv bintab.c.new bintab.c
 
@@ -202,13 +202,13 @@ define(`EC_SOURCES',
 
 define(`PGEN_SOURCES',
 	`pfilt.c rabin.c \
-	pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
-	limlee.c \
+	pgen.c pgen-stdev.c pgen-gcd.c pgen-simul.c \
+	  prim.c strongprime.c limlee.c \
 	keycheck.c keycheck-mp.c keycheck-report.c \
 	bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
 	rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
 	oaep.c pkcs1.c pss.c \
-	dh-gen.c dh-limlee.c dh-check.c dh-fetch.c dh-param.c \
+	dh-gen.c dh-limlee.c dh-kcdsa.c dh-check.c dh-fetch.c dh-param.c \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
 	gdsa.c gkcdsa.c \
 	key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
@@ -261,7 +261,7 @@ noinst_PROGRAMS = \
 	genprimes mptypes serpent-check bittest mpdump \
 	perftest \
 	addsuffix(`gen_tables', `-mktab')
-LDADD = libcatacomb.la libcatcrypt.a
+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')
@@ -282,6 +282,7 @@ factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
 pixie_LDADD =
+pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
 bittest_LDADD = 
@@ -306,6 +307,7 @@ mpdump_SOURCES = \
 	mp-misc.c mp-mem.c mp-const.c mp-arith.c mp-io.c \
 	mptext.c mptext-string.c
 mpdump_LDADD =
+mpdump_CFLAGS = $(AM_CFLAGS)
 
 ## --- Install the pixie setuid-root if we can ---
 ##
@@ -329,15 +331,24 @@ changequote(`, ')
 ## --- Documentation ---
 
 man_MANS = \
-	key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 \
+	key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 mkphrase.1 \
 	keyring.5 pixie.1
 
+## --- Prime group keyring ---
+
+pkgdata_DATA = pgroups.kr
+
+$(srcdir)/pgroups.kr: ptab.in mkpgroups
+	cd $(srcdir) && rm -f pgroups.kr && ./mkpgroups <ptab.in
+
 ## --- Other handy definitions ---
 
 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 bintab.in bin-gentab.awk \
+	ectab.in ec-gentab.awk \
+	ptab.in p-gentab.awk mkpgroups pgroups.kr \
+	bintab.in bin-gentab.awk \
 	README.cipher README.hash README.random README.mp \
 	debian/rules debian/copyright debian/control debian/changelog \
 	debian/catacomb-bin.postinst debian/catacomb-bin.config \
@@ -365,11 +376,11 @@ define(`testprogs', `')
 
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
-	$1.t)dnl
+	$1.t$(EXEEXT))dnl
 $1.to: $1.c
 	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
-$1.t: $1.to libcatacomb.la
-	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
+$1.t$(EXEEXT): $1.to libcatacomb.la
+	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t$(EXEEXT)')
 
 CTESTRIG(rc4)
 CTESTRIG(seal)
@@ -428,8 +439,8 @@ CTESTRIG(rho)
 TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
-	*.t *.to \
-	mptypes.h primetab.c primetab.h ectab.c \
+	*.t$(EXEEXT) *.to *.kr.old \
+	mptypes.h primetab.c primetab.h ectab.c ptab.c bintab.c \
 	addsuffix(`gen_tables', `-tab.h')
 
 ## --- Makefile building (haha!) ---
@@ -443,6 +454,7 @@ DISTCLEANFILES = libtool
 MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.am \
 	$(srcdir)/getdate.c getdate.c \
+	$(srcdir)/pgroups.kr \
 	$(MODES) modes-stamp $(srcdir)/modes-stamp
 
 ##----- That's all, folks ---------------------------------------------------