From 5a1a3a89c259ab3e66141f8acbc434d89273d582 Mon Sep 17 00:00:00 2001 From: mdw Date: Sat, 29 Jul 2000 10:02:36 +0000 Subject: [PATCH] Lots of fixing to support `make -j' building. --- Makefile.m4 | 90 +++++++++++++++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) diff --git a/Makefile.m4 b/Makefile.m4 index 45e60c6..8c5d32a 100644 --- a/Makefile.m4 +++ b/Makefile.m4 @@ -1,6 +1,6 @@ ## -*-makefile-*- ## -## $Id: Makefile.m4,v 1.36 2000/07/20 20:13:38 mdw Exp $ +## $Id: Makefile.m4,v 1.37 2000/07/29 10:02:36 mdw Exp $ ## ## Makefile for Catacomb ## @@ -29,6 +29,9 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.m4,v $ +## Revision 1.37 2000/07/29 10:02:36 mdw +## Lots of fixing to support `make -j' building. +## ## Revision 1.36 2000/07/20 20:13:38 mdw ## Added Bellare and Rogaway's PSS encoding for RSA signatures. ## @@ -185,38 +188,32 @@ MODES = \ adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.c') \ adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h') -$(MODES): +$(MODES): modes-stamp +modes-stamp: genmodes cd $(srcdir); ./genmodes "lit(`ciphers')" "lit(`cipher_modes')" cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')" + echo datestamp >modes-stamp + +define(`tables', `dnl +_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl +_(gfshare)') -des-tab.h: des-mktab - ./des-mktab >des-tab.h -blowfish-tab.h: blowfish-mktab - ./blowfish-mktab >blowfish-tab.h -twofish-tab.h: twofish-mktab - ./twofish-mktab >twofish-tab.h -square-tab.h: square-mktab - ./square-mktab >square-tab.h -rijndael-tab.h: rijndael-mktab - ./rijndael-mktab >rijndael-tab.h -tiger-tab.h: tiger-mktab - ./tiger-mktab >tiger-tab.h -gfshare-tab.h: gfshare-mktab - ./gfshare-mktab >gfshare-tab.h - -primetab.c primetab.h: genprimes +autoheaders: addsuffix(tables, `-tab.h') primetab.h mptypes.h +define(`emit', ` +_item`'-tab.h: _item`'-mktab + ./_item`'-mktab >_item`'-tab.h')dnl +tables + +primetab.h: primetab.c +primetab.c: genprimes ./genprimes -h primetab.h -c primetab.c -m 255 \ -t "unsigned char" -i primetab - archinclude_HEADERS = mptypes.h - mptypes.h: mptypes ./mptypes >mptypes.h BUILT_SOURCES = \ getdate.c \ - des-tab.h blowfish-tab.h twofish-tab.h rijndael-tab.h \ - gfshare-tab.h \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ @@ -232,16 +229,11 @@ libcatacomb_la_LDFLAGS = -version-info 2:0:0 pkginclude_HEADERS = \ arena.h paranoia.h \ - blkc.h hash.h \ - gcipher.h ghash.h gmac.h grand.h \ - ghash-def.h \ - rc4.h seal.h \ - rand.h noise.h fipstest.h maurer.h \ + blkc.h hash.h gcipher.h ghash.h gmac.h grand.h ghash-def.h \ + lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \ key.h key-data.h passphrase.h pixie.h lmem.h \ - lcrand.h fibrand.h \ mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \ - mpbarrett.h mpmont.h mpcrt.h \ - mprand.h mpmul.h \ + mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \ primetab.h pfilt.h primorial.h rabin.h \ pgen.h prim.h strongprime.h limlee.h \ bbs.h rsa.h dh.h dsarand.h dsa.h \ @@ -253,41 +245,37 @@ pkginclude_HEADERS = \ addsuffix(`cipher_modes', `-def.h') \ addsuffix(`hash_modes', `-def.h') -libcatacomb_la_SOURCES = \ +define(`lib_sources', `\ grand.c keysz.c \ des-base.c des-base.h \ cast-s.c cast-sk.c cast-base.h cast-tab.h \ - serpent-sbox.h \ - skipjack-tab.h \ - tiger-base.h \ + serpent-sbox.h skipjack-tab.h tiger-base.h \ daftstory.h \ - rc4.c seal.c \ - rand.c noise.c fipstest.c maurer.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 \ - lcrand.c fibrand.c \ mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h mpscan.c mparena.c \ mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \ mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c \ - mpint.c \ - mptext.c mptext-file.c mptext-string.c mptext-dstr.c \ - mpbarrett.c mpmont.c mpmont-mexp.c \ - mpcrt.c mpmul.c \ - mprand.c \ - primetab.c pfilt.c rabin.c primorial.c \ + mpint.c mptext.c mptext-file.c mptext-string.c mptext-dstr.c \ + mpbarrett.c mpmont.c mpmont-mexp.c mpcrt.c mpmul.c mprand.c \ + pfilt.c rabin.c primorial.c \ pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \ limlee.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-fetch.c \ - dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.c \ + dh-gen.c dh-limlee.c dh-fetch.c \ + dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \ gfshare.c share.c \ rho.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 key-error.c \ - key-fetch.c \ + key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \ + key-error.c key-fetch.c') +LIBSRC = lib_sources +libcatacomb_la_SOURCES = \ + lib_sources \ + primetab.c \ addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \ addsuffix(join(`hashes', `-', `hash_modes'), `.c') \ addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c') @@ -298,7 +286,8 @@ twofish.lo: twofish-tab.h square.lo: square-tab.h rijndael.lo: rijndael-tab.h tiger.lo: tiger-tab.h -mpx.lo: mptypes.h +gfshare.lo: gfshare-tab.h +$(LIBSRC) dsig.o keyutil.o rspit.o: mptypes.h primetab.h ## --- Utility programs --- @@ -369,6 +358,7 @@ EXTRA_DIST = \ dist-hook: @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true + @echo datestamp >$(distdir)/modes-stamp || true @mkdir $(distdir)/tests || true @ln $(srcdir)/tests/* $(distdir)/tests || true @rm -f $(distdir)/tests/*~ @@ -439,6 +429,6 @@ $(srcdir)/Makefile.am: $(srcdir)/Makefile.m4 MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.am \ $(srcdir)/getdate.c getdate.c \ - $(MODES) + $(MODES) modes-stamp $(srcdir)/modes-stamp ##----- That's all, folks --------------------------------------------------- -- 2.11.0