aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-06 12:07:58 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-03 11:29:47 -0500
commitd907fca29b188be5c8eaf01d086bac754bace400 (patch)
treee2731bf1ce066d8aedc7a5d1dd19bfe15b433546 /src/common
parentef13bf44327464c5600fdba12726fce00156d2b2 (diff)
downloadtor-d907fca29b188be5c8eaf01d086bac754bace400.tar
tor-d907fca29b188be5c8eaf01d086bac754bace400.tar.gz
Make libcurve25519_donna get built as a .a
This lets us give it compiler flags differing from the rest of libor-crypto.a
Diffstat (limited to 'src/common')
-rw-r--r--src/common/include.am22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/common/include.am b/src/common/include.am
index f986ba66d..808238dd1 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -15,19 +15,25 @@ libor_extra_source=
endif
if BUILD_CURVE25519_DONNA
-libcrypto_extra_source= \
- src/ext/curve25519_donna/curve25519-donna.c \
- src/common/crypto_curve25519.c
+src_common_libcurve25519_donna_a_SOURCES=\
+ src/ext/curve25519_donna/curve25519-donna.c
+noinst_LIBRARIES+=src/common/libcurve25519_donna.a
+LIBDONNA=src/common/libcurve25519_donna.a
else
if BUILD_CURVE25519_DONNA_C64
-libcrypto_extra_source= \
- src/ext/curve25519_donna/curve25519-donna-c64.c \
- src/common/crypto_curve25519.c
+src_common_libcurve25519_donna_a_SOURCES=\
+ src/ext/curve25519_donna/curve25519-donna-c64.c
+noinst_LIBRARIES+=src/common/libcurve25519_donna.a
+LIBDONNA=src/common/libcurve25519_donna.a
else
-if CURVE25519_ENABLED
-libcrypto_extra_source=src/common/crypto_curve25519.c
+LIBDONNA=
endif
endif
+
+src_common_libcurve25519_donna_a_CFLAGS =
+
+if CURVE25519_ENABLED
+libcrypto_extra_source=src/common/crypto_curve25519.c
endif
src_common_libor_a_SOURCES = \