X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2FMakefile.ad;h=286ead43dbf6b35c8e95894ebd82366d0a258351;hb=26618713bb72877372e5dc3b7b9f7d101c26fb78;hp=766ea169a1292a572f640aec8ea36d482a3e5345;hpb=8fd8212bcd16f2b53fbedff2a9b9a4e8c15b9695;p=crypto.git

diff --git a/lib/silccrypt/Makefile.ad b/lib/silccrypt/Makefile.ad
index 766ea169..286ead43 100644
--- a/lib/silccrypt/Makefile.ad
+++ b/lib/silccrypt/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2006 Pekka Riikonen
+#  Copyright (C) 2000 - 2008 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
@@ -17,6 +17,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilccrypt.la
 
 if SILC_AES_ASM
@@ -32,49 +34,47 @@ endif
 
 libsilccrypt_la_SOURCES = 	\
 	none.c 			\
-	rc5.c 			\
 	md5.c 			\
 	$(SILC_AES_S)		\
 	rsa.c 			\
+	dsa.c 			\
 	sha1.c 			\
 	sha256.c 		\
+	sha256_x86.S 		\
+	sha512.c 		\
 	twofish.c 		\
 	blowfish.c 		\
-	cast.c 			\
+	cast5.c			\
+	des.c			\
+	silccrypto.c		\
 	silccipher.c 		\
 	silchash.c 		\
-	silchmac.c 		\
+	silcmac.c 		\
 	silcrng.c 		\
 	silcpkcs.c 		\
 	silcpkcs1.c		\
 	silcpk.c
 
-if SILC_LIBTOOLFIX
-# Tell libtool to compile silccrypt as shared since silcsim will need it.
-LTFLAGS = --libtool-enable-shared
-else
-LTFLAGS =
-endif
-
-CFLAGS = $(LTFLAGS) @SILC_CRYPTO_CFLAGS@
+CFLAGS = @SILC_CRYPTO_CFLAGS@
 
-#ifdef SILC_DIST_TOOLKIT
 include_HEADERS =		\
+	silccrypto.h		\
 	silccipher.h		\
+	silccipher_i.h		\
 	silchash.h		\
-	silchmac.h		\
+	silcmac.h		\
 	silcpkcs.h		\
+	silcpkcs_i.h		\
 	silcrng.h		\
 	silcpkcs1.h		\
 	silcpk.h
 
-SILC_EXTRA_DIST = tests
-#endif SILC_DIST_TOOLKIT
+SILC_EXTRA_DIST =
 
 SUFFIXES = .asm
 
 .asm.lo:
-	$(LIBTOOL) --tag=CC --mode=compile @SILC_ASSEMBLER@ $<
+	$(LIBTOOL) --tag=CC --mode=compile @SILC_ASSEMBLER@ $< @SILC_AES_ASM_FLAGS@
 
 EXTRA_DIST = *.h *.asm $(SILC_EXTRA_DIST)