X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/1d6d3b01cb40e0cfaeb816c87c513695aea0816a..908ebb29ff621f582b34d48fd4278b60b78379b6:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 5d5420a..0ddfe8a 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -107,7 +107,7 @@ primetab.c: genprimes$(EXEEXT)
 wheel.h: wheel.c
 wheel.c: genwheel$(EXEEXT)
 	./genwheel -h wheel.h -c wheel.c \
-		-s CATACOMB_WHEEL_H -n 5
+		-s CATACOMB_WHEEL_H -n 5 \
 		-t "unsigned char" -i wheel
 
 archinclude_HEADERS = mptypes.h mplimits.h
@@ -163,7 +163,8 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 3:0:1
+libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
+libcatacomb_la_LDFLAGS = -version-info 3:1:1
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -230,7 +231,7 @@ define(`PGEN_SOURCES',
 	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-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 \
+	dsarand.c dsa-misc.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 \
 	key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \
@@ -277,7 +278,8 @@ bin_PROGRAMS = \
 	dsig key pixie cookie rspit factorial hashsum mkphrase \
 	catcrypt catsign
 noinst_LIBRARIES = libcatcrypt.a
-bin_SCRIPTS = catacomb-config xpixie
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = catacomb.pc
 noinst_PROGRAMS = \
 	genprimes genwheel mptypes genlimits serpent-check bittest mpdump \
 	perftest \
@@ -285,7 +287,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 \
@@ -302,10 +305,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_LDADD = $(PIXIE_LIBS)
 pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
+mkphrase_LDADD = $(CATACOMB_LIBS) $(LDADD)
 bittest_SOURCES = bittest.c
 bittest_LDADD =
 
@@ -361,7 +366,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
@@ -372,7 +377,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 \
@@ -405,7 +410,7 @@ define(`CTESTRIG',
 $1.to: $1.c
 	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
 $1.t$(EXEEXT): $1.to libcatacomb.la
-	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t$(EXEEXT)')
+	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(CATACOMB_LIBS) $(LIBS) -o $1.t$(EXEEXT)')
 
 CTESTRIG(rc4)
 CTESTRIG(seal)