mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Make libcurve25519_donna get built as a .a
This lets us give it compiler flags differing from the rest of libor-crypto.a
This commit is contained in:
parent
ef13bf4432
commit
d907fca29b
@ -15,20 +15,26 @@ 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
|
||||
LIBDONNA=
|
||||
endif
|
||||
endif
|
||||
|
||||
src_common_libcurve25519_donna_a_CFLAGS =
|
||||
|
||||
if CURVE25519_ENABLED
|
||||
libcrypto_extra_source=src/common/crypto_curve25519.c
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
src_common_libor_a_SOURCES = \
|
||||
src/common/address.c \
|
||||
|
@ -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@
|
||||
|
@ -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@
|
||||
|
@ -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@
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user