X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2FMakefile.am;h=3dd281ca453b60687de3d847b636417272633bcf;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=e55cb151c4197e0f1ec814bc0df0885058e9b4ca;hpb=ee9ad49e68cd69759ca643579c2f0de0747c4f61;p=silc.git

diff --git a/lib/silccrypt/Makefile.am b/lib/silccrypt/Makefile.am
index e55cb151..3dd281ca 100644
--- a/lib/silccrypt/Makefile.am
+++ b/lib/silccrypt/Makefile.am
@@ -18,13 +18,12 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-noinst_LIBRARIES = libsilccrypt.a
+noinst_LTLIBRARIES = libsilccrypt.la
 
-libsilccrypt_a_SOURCES = \
+libsilccrypt_la_SOURCES = \
 	none.c \
 	rc5.c \
 	rc6.c \
-	mars.c \
 	md5.c \
 	aes.c \
 	rsa.c \
@@ -39,13 +38,22 @@ libsilccrypt_a_SOURCES = \
 	silcpkcs.c \
 	pkcs1.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)
+
+if SILC_DIST_TOOLKIT
 include_HEADERS =	\
 	aes.h		\
 	blowfish.h	\
 	cast.h		\
 	ciphers_def.h	\
 	ciphers.h	\
-	mars.h		\
 	md5.h		\
 	none.h		\
 	pkcs1.h		\
@@ -60,7 +68,15 @@ include_HEADERS =	\
 	silcpkcs.h	\
 	silcrng.h	\
 	twofish.h
+endif
 
-EXTRA_DIST = *.h
+EXTRA_DIST = *.h tests
 
 include $(top_srcdir)/Makefile.defines.in
+
+# Workaround a bug in GCC 2.x which causes memory exhaustion
+# when compiling sha1 with optimizations on UltraSPARC.
+#
+@FIX_SHA1@sha1.lo:
+@FIX_SHA1@	$(LTCOMPILE) -O0 -c -o $@ `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
+@FIX_SHA1@