Make libcurve25519_donna get built as a .a

This lets us give it compiler flags differing from the rest of
libor-crypto.a

diff --git a/src/common/include.am b/src/common/include.am
index f986ba66d312cdc4230ed6f2d3c2921193dc33fe..808238dd1fb25c4bc703c749f3b0f5f2f1824240 100644 (file)
--- 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 = \

diff --git a/src/or/include.am b/src/or/include.am
index 600f9d5cadba3dc1046a401c8bd9cc68f3a10d6c..08a27e17b2059cad1a77c901ab608b30a475ca16 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -95,7 +95,8 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \
 
 
 src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
-src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypto.a \
+src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \
+       src/common/libor-crypto.a $(LIBDONNA) \
        src/common/libor-event.a \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
        @TOR_LIB_WS32@ @TOR_LIB_GDI@

diff --git a/src/test/include.am b/src/test/include.am
index 075df36460c5c6447b40a9c1bfef1ba95dfc09b9..e4f2897cde54304cfe60791aa6130846509feaf1 100644 (file)
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -36,14 +36,16 @@ src_test_bench_CPPFLAGS= $(src_test_AM_CPPFLAGS)
 
 src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
-src_test_test_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypto.a \
+src_test_test_LDADD = src/or/libtor.a src/common/libor.a \
+       src/common/libor-crypto.a $(LIBDONNA) \
        src/common/libor-event.a \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 
 src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
-src_test_bench_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypto.a \
+src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
+       src/common/libor-crypto.a $(LIBDONNA) \
        src/common/libor-event.a \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@

diff --git a/src/tools/include.am b/src/tools/include.am
index 7337eff163838b072ad2676e754a4b4ebe4a4c0c..610864f68f6b190fc64ffa3f886a915bdc86de75 100644 (file)
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -8,12 +8,14 @@ src_tools_tor_resolve_LDADD = src/common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@
 src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c
 src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \
+       $(LIBDONNA) \
         @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
         @TOR_LIB_WS32@ @TOR_LIB_GDI@
 
 src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c
 src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \
+       $(LIBDONNA) \
         @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
         @TOR_LIB_WS32@ @TOR_LIB_GDI@