diff options
Diffstat (limited to 'cipher')
-rw-r--r-- | cipher/ChangeLog | 6 | ||||
-rw-r--r-- | cipher/Makefile.am | 32 |
2 files changed, 30 insertions, 8 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index f0e7efb0f..1efddea8f 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,9 @@ +2005-12-06 David Shaw <[email protected]> + + * Makefile.am: Some cleanup so we don't build files that are + completely ifdeffed out. This causes a warning on Sun's cc. Do + sha512.c as well for consistency. + 2005-08-11 Werner Koch <[email protected]> * rijndael.c (rijndael_cfb_encrypt): Experimental code to improve diff --git a/cipher/Makefile.am b/cipher/Makefile.am index 12c4bb0b5..0aef60579 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, +# 2005 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -44,16 +45,31 @@ libcipher_a_SOURCES = cipher.c \ dsa.c \ smallprime.c \ algorithms.h \ - rndlinux.c \ - rndunix.c \ - rndegd.c \ - rndw32.c \ md5.c \ rmd160.c \ sha1.c \ sha256.c -EXTRA_libcipher_a_SOURCES = idea-stub.c sha512.c +if USE_RNDLINUX +libcipher_a_SOURCES+=rndlinux.c +endif -libcipher_a_DEPENDENCIES = @IDEA_O@ @SHA512_O@ -libcipher_a_LIBADD = @IDEA_O@ @SHA512_O@ +if USE_RNDUNIX +libcipher_a_SOURCES+=rndunix.c +endif + +if USE_RNDEGD +libcipher_a_SOURCES+=rndegd.c +endif + +if USE_RNDW32 +libcipher_a_SOURCES+=rndw32.c +endif + +if USE_SHA512 +libcipher_a_SOURCES+=sha512.c +endif + +EXTRA_libcipher_a_SOURCES=idea-stub.c +libcipher_a_DEPENDENCIES=@IDEA_O@ +libcipher_a_LIBADD=@IDEA_O@ |