aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorMartin Hebnes Pedersen <martin.h.pedersen@gmail.com>2011-12-17 14:30:41 +0100
committerNick Mathewson <nickm@torproject.org>2011-12-19 11:27:08 -0500
commitf783a326b82518bf75b1d3952332b05aac7ffd9b (patch)
tree44a83bb7b7470029d5e6dd061459f6779b5a59fa /src/tools
parent37504b5efae2e1423ec09eae6fc6d1e229987e3d (diff)
downloadtor-f783a326b82518bf75b1d3952332b05aac7ffd9b.tar
tor-f783a326b82518bf75b1d3952332b05aac7ffd9b.tar.gz
-lm should not be hardcoded.
On some platforms (Haiku/BeOS) libm lives in libcore. Also added 'network' to the list of libraries to search for connect().
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index a9a619757..35b0a41f5 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -3,17 +3,19 @@ noinst_PROGRAMS = tor-checkkey
tor_resolve_SOURCES = tor-resolve.c
tor_resolve_LDFLAGS =
-tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@
+tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@
tor_gencert_SOURCES = tor-gencert.c
tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \
- -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
+ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+ @TOR_LIB_WS32@ @TOR_LIB_GDI@
tor_checkkey_SOURCES = tor-checkkey.c
tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \
- -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
+ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+ @TOR_LIB_WS32@ @TOR_LIB_GDI@
SUBDIRS = tor-fw-helper
DIST_SUBDIRS = tor-fw-helper