projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
lib
/
silccrypt
/
Makefile.am
diff --git
a/lib/silccrypt/Makefile.am
b/lib/silccrypt/Makefile.am
index e55cb151c4197e0f1ec814bc0df0885058e9b4ca..3dd281ca453b60687de3d847b636417272633bcf 100644
(file)
--- a/
lib/silccrypt/Makefile.am
+++ b/
lib/silccrypt/Makefile.am
@@
-18,13
+18,12
@@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
-noinst_L
IBRARIES = libsilccrypt.
a
+noinst_L
TLIBRARIES = libsilccrypt.l
a
-libsilccrypt_a_SOURCES = \
+libsilccrypt_
l
a_SOURCES = \
none.c \
rc5.c \
rc6.c \
none.c \
rc5.c \
rc6.c \
- mars.c \
md5.c \
aes.c \
rsa.c \
md5.c \
aes.c \
rsa.c \
@@
-39,13
+38,22
@@
libsilccrypt_a_SOURCES = \
silcpkcs.c \
pkcs1.c
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 \
include_HEADERS = \
aes.h \
blowfish.h \
cast.h \
ciphers_def.h \
ciphers.h \
- mars.h \
md5.h \
none.h \
pkcs1.h \
md5.h \
none.h \
pkcs1.h \
@@
-60,7
+68,15
@@
include_HEADERS = \
silcpkcs.h \
silcrng.h \
twofish.h
silcpkcs.h \
silcrng.h \
twofish.h
+endif
-EXTRA_DIST = *.h
+EXTRA_DIST = *.h
tests
include $(top_srcdir)/Makefile.defines.in
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@