symm/: Eliminate the remaining checked-in stubby source files.

[catacomb] / symm / Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index ee3d417..a15ef2e 100644 (file)
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -69,7 +69,7 @@ $(srcdir)/modes.am: modes.am.in Makefile.am
                        hashmacmode="$(HASHMACMODES)"
 $(srcdir)/stubs.am: stubs.am.in Makefile.am
        $(AM_V_GEN)$(multigen) -g $(srcdir)/stubs.am.in $(srcdir)/stubs.am \
-               descr,hname,base="$(STUBS_HDR)" cname="$(STUBS_SRC)"
+               descr,hname,base="$(STUBS_HDR)" cname,cbase="$(STUBS_SRC)"
 
 ## Initialize lists of known classes.
 ALL_CIPHERS             = $(CIPHER_MODES)
@@ -219,6 +219,7 @@ 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
+STUBS_SRC              += safersk,safer
 if !CROSS_COMPILING
 $(precomp)/symm/safer-tab.c:
        $(AM_V_at)$(MKDIR_P) $(precomp)/symm
@@ -330,6 +331,8 @@ HASHES                      += sha224 sha256
 HASHES                 += sha384 sha512
 STUBS_HDR              += SHA-224,sha224,sha256
 STUBS_HDR              += SHA-384,sha384,sha512
+STUBS_SRC              += sha224,sha256
+STUBS_SRC              += sha384,sha512
 
 ## Anderson and Biham's `Tiger' hash function.
 HASHES                 += tiger
@@ -352,6 +355,7 @@ 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
+STUBS_SRC              += whirlpool256,whirlpool
 if !CROSS_COMPILING
 $(precomp)/symm/whirlpool-tab.c:
        $(AM_V_at)$(MKDIR_P) $(precomp)/symm
@@ -410,9 +414,13 @@ libsymm_la_SOURCES += salsa20-arm-neon.S
 endif
 TESTS                  += salsa20.t$(EXEEXT)
 ALL_CIPHERS            += salsa20 salsa2012 salsa208
+ALL_CIPHERS            += salsa20-ietf salsa2012-ietf salsa208-ietf
 ALL_CIPHERS            += xsalsa20 xsalsa2012 xsalsa208
 STUBS_HDR              += Salsa20/12,salsa2012,salsa20
 STUBS_HDR              += Salsa20/8,salsa208,salsa20
+STUBS_HDR              += Salsa20-IETF,salsa20-ietf,salsa20
+STUBS_HDR              += Salsa20/12-IETF,salsa2012-ietf,salsa20
+STUBS_HDR              += Salsa20/8-IETF,salsa208-ietf,salsa20
 STUBS_HDR              += XSalsa20,xsalsa20,salsa20
 STUBS_HDR              += XSalsa20/12,xsalsa2012,salsa20
 STUBS_HDR              += XSalsa20/8,xsalsa208,salsa20
@@ -446,10 +454,14 @@ endif
 TESTS                  += chacha.t$(EXEEXT)
 EXTRA_DIST             += t/chacha
 ALL_CIPHERS            += chacha20 chacha12 chacha8
+ALL_CIPHERS            += chacha20-ietf chacha12-ietf chacha8-ietf
 ALL_CIPHERS            += xchacha20 xchacha12 xchacha8
 STUBS_HDR              += ChaCha20,chacha20,chacha
 STUBS_HDR              += ChaCha12,chacha12,chacha
 STUBS_HDR              += ChaCha8,chacha8,chacha
+STUBS_HDR              += ChaCha20-IETF,chacha20-ietf,chacha
+STUBS_HDR              += ChaCha12-IETF,chacha12-ietf,chacha
+STUBS_HDR              += ChaCha8-IETF,chacha8-ietf,chacha
 STUBS_HDR              += XChaCha20,xchacha20,chacha
 STUBS_HDR              += XChaCha12,xchacha12,chacha
 STUBS_HDR              += XChaCha8,xchacha8,chacha
@@ -478,16 +490,16 @@ MAINTAINERCLEANFILES      += modes/gen-stamp
 modes/gen-stamp: Makefile.am
        $(AM_V_at)$(MKDIR_P) $(srcdir)/modes
        $(AM_V_GEN)$(multigen) -g $(srcdir)/mode.c.in \
-               $(srcdir)/modes/@base-@mode.c \
+               $(srcdir)/modes/@{base:f}-@mode.c \
                base="$(BLKCS)" mode="$(BLKCMODES)"
        $(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
-               $(srcdir)/modes/@base-@mode.h \
+               $(srcdir)/modes/@{base:f}-@mode.h \
                base="$(BLKCS)" mode="$(BLKCMODES)"
        $(AM_V_at)$(multigen) -g $(srcdir)/mode.c.in \
-               $(srcdir)/modes/@base-@mode.c \
+               $(srcdir)/modes/@{base:f}-@mode.c \
                base="$(HASHES)" mode="$(HASHMODES)"
        $(AM_V_at)$(multigen) -g $(srcdir)/mode.h.in \
-               $(srcdir)/modes/@base-@mode.h \
+               $(srcdir)/modes/@{base:f}-@mode.h \
                base="$(HASHES)" mode="$(HASHMODES)"
        $(AM_V_at)touch $(srcdir)/modes/gen-stamp
 
@@ -518,7 +530,7 @@ stubs.gen-stamp: Makefile.am
        $(AM_V_GEN)$(multigen) -g $(srcdir)/stub.h.in \
                $(srcdir)/@name.h descr,name,base="$(STUBS_HDR)"
        $(AM_V_GEN)$(multigen) -g $(srcdir)/stub.c.in \
-               $(srcdir)/@name.c name="$(STUBS_SRC)"
+               $(srcdir)/@name.c name,base="$(STUBS_SRC)"
        $(AM_V_at)touch $(srcdir)/stubs.gen-stamp
 
 ## Generated stub headers.