* testsuite/Makefile.am (CFLAGS): Added sha256-test.

Rev: src/nettle/Makefile.am:1.16
Rev: src/nettle/testsuite/Makefile.am:1.11

diff --git a/Makefile.am b/Makefile.am
index 5927cb1eee8687ddbb4fa328525bb39880658911..046cccf0ffd75ef09e1bf60dcddd7f0b73081dbf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 SUBDIRS = . testsuite
 
-noinst_PROGRAMS = desdata
+noinst_PROGRAMS = desdata shadata
 
 libnettleincludedir = $(includedir)/nettle
 
 lib_LIBRARIES = libnettle.a
 libnettleinclude_HEADERS = aes.h arcfour.h blowfish.h cast128.h des.h des-compat.h \
                           serpent.h twofish.h \
-                          md5.h md5-compat.h sha1.h \
+                          md5.h md5-compat.h sha.h \
                           cbc.h
 
 libnettle_a_SOURCES = aes.c aes.h arcfour.c arcfour.h \
@@ -17,12 +17,14 @@ libnettle_a_SOURCES = aes.c aes.h arcfour.c arcfour.h \
                      des.c des.h desinfo.h desCode.h \
                      des3.c des-compat.c des-compat.h \
                      md5.c md5.h md5-compat.c md5-compat.h \
-                     sha1.c sha1.h \
+                     sha.h sha1.c sha256.c \
                      serpent.c serpent.h serpent_sboxes.h \
                      twofish.c twofish.h
 
 libnettle_a_LIBADD = @LIBOBJS@
 
+shadata_LDADD = -lm
+
 info_TEXINFOS = nettle.texinfo
 
 all-local: nettle.html

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 7f1da5e9c43ee990fb955060994e599e6c10f53b..f01c8996ee7a41618f901cd462af2a79c55408c4 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -3,13 +3,13 @@ CPPFLAGS = @CPPFLAGS@
 
 TS_PROGS = aes-test arcfour-test blowfish-test cast128-test \
           des-test des3-test des-compat-test \
-          md5-test md5-compat-test sha1-test \
+          md5-test md5-compat-test sha1-test sha256-test \
           serpent-test twofish-test \
           cbc-test
 
 M4_FILES = aes-test.m4 arcfour-test.m4 blowfish-test.m4 cast128-test.m4 \
           des-test.m4 des3-test.m4 \
-          md5-test.m4 md5-compat-test.m4 sha1-test.m4 \
+          md5-test.m4 md5-compat-test.m4 sha1-test.m4 sha256-test.m4 \
           serpent-test.m4 twofish-test.m4 \
           cbc-test.m4