X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/7fcfe7de9c3227fedee03b56e7f69fd9646d4e38..3384672ab8c0ebc1aec36175d255d2674b172b2d:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 80e697d..e317db9 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
 
@@ -220,7 +220,7 @@ libcatacomb_la_SOURCES = \
 	grand.c keysz.c \
 	lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
 	arena.c \
-	passphrase.c pixie-client.c pixie-common.c lmem.c \
+	passphrase.c pixie-common.c lmem.c \
 	tlsprf.c sslprf.c \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
@@ -253,14 +253,15 @@ gfx-sqr.lo: gfx-sqr-tab.h
 ## --- Utility programs ---
 
 bin_PROGRAMS = \
-	dsig key pixie cookie rspit factorial hashsum mkphrase catcrypt
+	dsig key pixie cookie rspit factorial hashsum mkphrase \
+	catcrypt catsign
 noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 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')
@@ -273,13 +274,15 @@ patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
 dsig_SOURCES = dsig.c
 cookie_SOURCES = cookie.c
 catcrypt_SOURCES = catcrypt.c
+catsign_SOURCES = catsign.c
 key_SOURCES = keyutil.c
 hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
-pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.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 = 
@@ -304,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 ---
 ##
@@ -311,7 +315,7 @@ mpdump_LDADD =
 ## `install' if there are subdirectories.
 
 changequote(<, >)
-install: install-exec-hook
+# install: install-exec-hook
 install-exec-hook:
 	@pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \
 	if chown root $$pixie && chmod 4755 $$pixie; then \
@@ -326,14 +330,18 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 dsig.1 cookie.1 catcrypt.1 hashsum.1 keyring.5 pixie.1
+man_MANS = \
+	key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 mkphrase.1 \
+	keyring.5 pixie.1
 
 ## --- 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 \
+	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 \
@@ -361,11 +369,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)
@@ -424,8 +432,8 @@ CTESTRIG(rho)
 TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
-	*.t *.to \
-	mptypes.h primetab.c primetab.h ectab.c \
+	*.t$(EXEEXT) *.to \
+	mptypes.h primetab.c primetab.h ectab.c ptab.c bintab.c \
 	addsuffix(`gen_tables', `-tab.h')
 
 ## --- Makefile building (haha!) ---