[or-cvs] [tor/master] Stop linking src/tools/* against libevent

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Thu, 11 Nov 2010 23:50:33 -0500
Subject: Stop linking src/tools/* against libevent
Commit: edec2797d7e0c582928131e3fedbdea18cd0584e

---
 changes/bug507.event  |    4 ++++
 src/tools/Makefile.am |   14 ++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 changes/bug507.event

diff --git a/changes/bug507.event b/changes/bug507.event
new file mode 100644
index 0000000..68ef4b1
--- /dev/null
+++ b/changes/bug507.event
@@ -0,0 +1,4 @@
+  o Code simplifications
+    - We no longer need link tor-gencert, tor-resolve, or tor-checkkey
+      against libevent; they don't use them, and our code was already
+      refactored not to force them to use them.
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index de90797..a9a6197 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -2,20 +2,18 @@ bin_PROGRAMS = tor-resolve tor-gencert
 noinst_PROGRAMS =  tor-checkkey
 
 tor_resolve_SOURCES = tor-resolve.c
-tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@
-tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@
+tor_resolve_LDFLAGS =
+tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@
 
 tor_gencert_SOURCES = tor-gencert.c
-tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@
+tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \
-        -lm @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
+        -lm @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_LDFLAGS_libevent@
+tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \
-        -lm @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
+        -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 
 SUBDIRS =      tor-fw-helper
 DIST_SUBDIRS = tor-fw-helper
-- 
1.7.1