X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/55d8165698494a72b866a02f9fbf02d99320e7df..3a5a9d7dc98929e8db17e3e2652ecfd06bef0c67:/symm/Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 63bf26b7..7deed65c 100644
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -102,16 +102,17 @@ pkginclude_HEADERS	+= $(BLKC_H)
 
 ## Schneier's `Blowfish' block cipher.
 BLKCS			+= blowfish
-libsymm_la_SOURCES	+= $(precomp)/blowfish-tab.c
-PRECOMPS		+= $(precomp)/blowfish-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/blowfish-tab.c
+PRECOMPS		+= $(precomp)/symm/blowfish-tab.c
 PRECOMP_PROGS		+= blowfish-mktab
 blowfish_mktab_CPPFLAGS	 = $(AM_CPPFLAGS) -DQUIET
 if !CROSS_COMPILING
-$(precomp)/blowfish-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/blowfish-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) blowfish-mktab$e
-	$(AM_V_GEN)./blowfish-mktab >$(precomp)/blowfish-tab.c.new && \
-		mv $(precomp)/blowfish-tab.c.new $(precomp)/blowfish-tab.c
+	$(AM_V_GEN)./blowfish-mktab >$(precomp)/symm/blowfish-tab.c.new && \
+		mv $(precomp)/symm/blowfish-tab.c.new \
+			$(precomp)/symm/blowfish-tab.c
 endif
 
 ## Adams and Tavares' `CAST' block ciphers.
@@ -128,15 +129,16 @@ t/cast256: t/cast256.aes
 
 ## IBM's `DES' block cipher, by Feistel, Coppersmith, and others.
 BLKCS			+= des des3
-libsymm_la_SOURCES	+= des-base.h $(precomp)/des-tab.c
-PRECOMPS		+= $(precomp)/des-tab.c
+libsymm_la_SOURCES	+= des-base.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/des-tab.c
+PRECOMPS		+= $(precomp)/symm/des-tab.c
 PRECOMP_PROGS		+= des-mktab
 if !CROSS_COMPILING
-$(precomp)/des-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/des-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) des-mktab$e
-	$(AM_V_GEN)./des-mktab >$(precomp)/des-tab.c.new && \
-		mv $(precomp)/des-tab.c.new $(precomp)/des-tab.c
+	$(AM_V_GEN)./des-mktab >$(precomp)/symm/des-tab.c.new && \
+		mv $(precomp)/symm/des-tab.c.new $(precomp)/symm/des-tab.c
 endif
 
 ## Rivest's `DESX' variant, with pre- and post-whitening.
@@ -148,15 +150,15 @@ BLKCS			+= idea
 
 ## IBM's `MARS' block cipher.
 BLKCS			+= mars
-libsymm_la_SOURCES	+= $(precomp)/mars-tab.c
-PRECOMPS		+= $(precomp)/mars-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/mars-tab.c
+PRECOMPS		+= $(precomp)/symm/mars-tab.c
 PRECOMP_PROGS		+= mars-mktab
 if !CROSS_COMPILING
-$(precomp)/mars-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/mars-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) mars-mktab$e
-	$(AM_V_GEN)./mars-mktab >$(precomp)/mars-tab.c.new && \
-		mv $(precomp)/mars-tab.c.new $(precomp)/mars-tab.c
+	$(AM_V_GEN)./mars-mktab >$(precomp)/symm/mars-tab.c.new && \
+		mv $(precomp)/symm/mars-tab.c.new $(precomp)/symm/mars-tab.c
 endif
 mars.$t: t/mars
 EXTRA_DIST		+= t/mars.aes
@@ -180,15 +182,16 @@ BLKCS			+= rc5
 ## Daemen and Rijmen's `Rijndael' block cipher, selected as AES.
 BLKCS			+= rijndael rijndael192 rijndael256
 libsymm_la_SOURCES	+= rijndael-base.h rijndael-base.c
-libsymm_la_SOURCES	+= $(precomp)/rijndael-tab.c
-PRECOMPS		+= $(precomp)/rijndael-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/rijndael-tab.c
+PRECOMPS		+= $(precomp)/symm/rijndael-tab.c
 PRECOMP_PROGS		+= rijndael-mktab
 if !CROSS_COMPILING
-$(precomp)/rijndael-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/rijndael-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) rijndael-mktab$e
-	$(AM_V_GEN)./rijndael-mktab >$(precomp)/rijndael-tab.c.new && \
-		mv $(precomp)/rijndael-tab.c.new $(precomp)/rijndael-tab.c
+	$(AM_V_GEN)./rijndael-mktab >$(precomp)/symm/rijndael-tab.c.new && \
+		mv $(precomp)/symm/rijndael-tab.c.new \
+			$(precomp)/symm/rijndael-tab.c
 endif
 rijndael.$t: t/rijndael
 EXTRA_DIST		+= t/rijndael.aes
@@ -201,16 +204,17 @@ t/rijndael: t/rijndael.aes
 
 ## Massey's `SAFER' block ciphers.
 BLKCS			+= safer safersk
-libsymm_la_SOURCES	+= $(precomp)/safer-tab.c
-PRECOMPS		+= $(precomp)/safer-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/safer-tab.c
+PRECOMPS		+= $(precomp)/symm/safer-tab.c
 PRECOMP_PROGS		+= safer-mktab
 STUBS_HDR		+= SAFER-SK,safersk,safer
 if !CROSS_COMPILING
-$(precomp)/safer-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/safer-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) safer-mktab$e
-	$(AM_V_GEN)./safer-mktab >$(precomp)/safer-tab.c.new && \
-		mv $(precomp)/safer-tab.c.new $(precomp)/safer-tab.c
+	$(AM_V_GEN)./safer-mktab >$(precomp)/symm/safer-tab.c.new && \
+		mv $(precomp)/symm/safer-tab.c.new \
+			$(precomp)/symm/safer-tab.c
 endif
 
 ## Anderson, Biham and Knudsen's `Serpent' block cipher.
@@ -234,15 +238,16 @@ libsymm_la_SOURCES	+= skipjack-tab.c
 
 ## Daemen and Rijmen's `Square' block cipher.
 BLKCS			+= square
-libsymm_la_SOURCES	+= $(precomp)/square-tab.c
-PRECOMPS		+= $(precomp)/square-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/square-tab.c
+PRECOMPS		+= $(precomp)/symm/square-tab.c
 PRECOMP_PROGS		+= square-mktab
 if !CROSS_COMPILING
-$(precomp)/square-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/square-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) square-mktab$e
-	$(AM_V_GEN)./square-mktab >$(precomp)/square-tab.c.new && \
-		mv $(precomp)/square-tab.c.new $(precomp)/square-tab.c
+	$(AM_V_GEN)./square-mktab >$(precomp)/symm/square-tab.c.new && \
+		mv $(precomp)/symm/square-tab.c.new \
+			$(precomp)/symm/square-tab.c
 endif
 
 ## Wheeler and Needham's `TEA' and `XTEA' block ciphers.
@@ -251,15 +256,16 @@ BLKCS			+= tea xtea
 ## Schneier, Kelsey, Whiting, Wagner, Hall and Ferguson's `Twofish' block
 ## cipher.
 BLKCS			+= twofish
-libsymm_la_SOURCES	+= $(precomp)/twofish-tab.c
-PRECOMPS		+= $(precomp)/twofish-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/twofish-tab.c
+PRECOMPS		+= $(precomp)/symm/twofish-tab.c
 PRECOMP_PROGS		+= twofish-mktab
 if !CROSS_COMPILING
-$(precomp)/twofish-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/twofish-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) twofish-mktab$e
-	$(AM_V_GEN)./twofish-mktab >$(precomp)/twofish-tab.c.new && \
-		mv $(precomp)/twofish-tab.c.new $(precomp)/twofish-tab.c
+	$(AM_V_GEN)./twofish-mktab >$(precomp)/symm/twofish-tab.c.new && \
+		mv $(precomp)/symm/twofish-tab.c.new \
+			$(precomp)/symm/twofish-tab.c
 endif
 twofish.$t: t/twofish
 EXTRA_DIST		+= t/twofish.aes
@@ -316,29 +322,33 @@ STUBS_HDR		+= SHA-384,sha384,sha512
 
 ## Anderson and Biham's `Tiger' hash function.
 HASHES			+= tiger
-libsymm_la_SOURCES	+= tiger-base.h $(precomp)/tiger-tab.c
-PRECOMPS		+= $(precomp)/tiger-tab.c
+libsymm_la_SOURCES	+= tiger-base.h
+nodist_libsymm_la_SOURCES += ../precomp/symm/tiger-tab.c
+PRECOMPS		+= $(precomp)/symm/tiger-tab.c
 PRECOMP_PROGS		+= tiger-mktab
 if !CROSS_COMPILING
-$(precomp)/tiger-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/tiger-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) tiger-mktab$e
-	$(AM_V_GEN)./tiger-mktab >$(precomp)/tiger-tab.c.new && \
-		mv $(precomp)/tiger-tab.c.new $(precomp)/tiger-tab.c
+	$(AM_V_GEN)./tiger-mktab >$(precomp)/symm/tiger-tab.c.new && \
+		mv $(precomp)/symm/tiger-tab.c.new \
+			$(precomp)/symm/tiger-tab.c
 endif
 
 ## Barreto and Rijmen's `Whirlpool' hash function.
 HASHES			+= whirlpool whirlpool256
-libsymm_la_SOURCES	+= $(precomp)/whirlpool-tab.c
-PRECOMPS		+= $(precomp)/whirlpool-tab.c
+nodist_libsymm_la_SOURCES += ../precomp/symm/whirlpool-tab.c
+PRECOMPS		+= $(precomp)/symm/whirlpool-tab.c
 PRECOMP_PROGS		+= whirlpool-mktab
 STUBS_HDR		+= Whirlpool-256,whirlpool256,whirlpool
 if !CROSS_COMPILING
-$(precomp)/whirlpool-tab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)
+$(precomp)/symm/whirlpool-tab.c:
+	$(AM_V_at)$(MKDIR_P) $(precomp)/symm
 	$(AM_V_at)$(MAKE) whirlpool-mktab$e
-	$(AM_V_GEN)./whirlpool-mktab >$(precomp)/whirlpool-tab.c.new && \
-		mv $(precomp)/whirlpool-tab.c.new $(precomp)/whirlpool-tab.c
+	$(AM_V_GEN)./whirlpool-mktab \
+			>$(precomp)/symm/whirlpool-tab.c.new && \
+		mv $(precomp)/symm/whirlpool-tab.c.new \
+			$(precomp)/symm/whirlpool-tab.c
 endif
 
 ## Bellare, Canetti and Krawczyk's `HMAC' mode for message authentication.