X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2FMakefile.ad;h=0d1aa46b69a6fe0a47e81b1a170f4762a89af32f;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hp=c5b3a112bcf1391a79a03c5fd5e1cb0cc92e7e86;hpb=c257b555225193e54d85daf541d29578b3c93882;p=silc.git

diff --git a/lib/silccrypt/Makefile.ad b/lib/silccrypt/Makefile.ad
index c5b3a112..0d1aa46b 100644
--- a/lib/silccrypt/Makefile.ad
+++ b/lib/silccrypt/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2007 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,22 +19,39 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 noinst_LTLIBRARIES = libsilccrypt.la
 
-libsilccrypt_la_SOURCES = \
-	none.c \
-	rc5.c \
-	md5.c \
-	aes.c \
-	rsa.c \
-	sha1.c \
-	twofish.c \
-	blowfish.c \
-	cast.c \
-	silccipher.c \
-	silchash.c \
-	silchmac.c \
-	silcrng.c \
-	silcpkcs.c \
-	silcpkcs1.c
+if SILC_AES_ASM
+if SILC_I486
+SILC_AES_S = aes_x86.asm aes.c
+endif
+if SILC_X86_64
+SILC_AES_S = aes_x86_64.asm aes.c
+endif
+else
+SILC_AES_S = aes.c
+endif
+
+libsilccrypt_la_SOURCES = 	\
+	none.c 			\
+	md5.c 			\
+	$(SILC_AES_S)		\
+	rsa.c 			\
+	dsa.c 			\
+	sha1.c 			\
+	sha256.c 		\
+	sha256_x86.S 		\
+	sha512.c 		\
+	twofish.c 		\
+	blowfish.c 		\
+	cast5.c			\
+	des.c			\
+	silccrypto.c		\
+	silccipher.c 		\
+	silchash.c 		\
+	silchmac.c 		\
+	silcrng.c 		\
+	silcpkcs.c 		\
+	silcpkcs1.c		\
+	silcpk.c
 
 if SILC_LIBTOOLFIX
 # Tell libtool to compile silccrypt as shared since silcsim will need it.
@@ -43,33 +60,30 @@ else
 LTFLAGS =
 endif
 
-CFLAGS = $(LTFLAGS)
+CFLAGS = $(LTFLAGS) @SILC_CRYPTO_CFLAGS@
 
 #ifdef SILC_DIST_TOOLKIT
-include_HEADERS =	\
-	aes.h		\
-	blowfish.h	\
-	cast.h		\
-	ciphers_def.h	\
-	ciphers.h	\
-	md5.h		\
-	none.h		\
-	rc5.h		\
-	rsa.h		\
-	sha1.h		\
-	silccipher.h	\
-	silcdh.h	\
-	silchash.h	\
-	silchmac.h	\
-	silcpkcs.h	\
-	silcrng.h	\
-	silcpkcs1.h	\
-	twofish.h
+include_HEADERS =		\
+	silccrypto.h		\
+	silccipher.h		\
+	silccipher_i.h		\
+	silchash.h		\
+	silchmac.h		\
+	silcpkcs.h		\
+	silcpkcs_i.h		\
+	silcrng.h		\
+	silcpkcs1.h		\
+	silcpk.h
 
 SILC_EXTRA_DIST = tests
 #endif SILC_DIST_TOOLKIT
 
-EXTRA_DIST = *.h $(SILC_EXTRA_DIST)
+SUFFIXES = .asm
+
+.asm.lo:
+	$(LIBTOOL) --tag=CC --mode=compile @SILC_ASSEMBLER@ $<
+
+EXTRA_DIST = *.h *.asm $(SILC_EXTRA_DIST)
 
 include $(top_srcdir)/Makefile.defines.in