diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-06-04 01:05:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-06-12 14:27:52 -0400 |
commit | e5b88dc83fb44622f2b0f9c0c242907d1c02311f (patch) | |
tree | 4a3932831da9df966b74ddf59b16aaa2445edb12 /src/common/Makefile.am | |
parent | cfce7d5deab7839c0ac67c3777e70a2264176ca0 (diff) | |
download | tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.tar.gz tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.zip |
Update Tor to use Libevent 2.0 APIs when available.
This patch adds a new compat_libevent.[ch] set of files, and moves our
Libevent compatibility and utilitity functions there. We build them
into a separate .a so that nothing else in src/commmon depends on
Libevent (partially fixing bug 507).
Also, do not use our own built-in evdns copy when we have Libevent
2.0, whose evdns is finally good enough (thus fixing Bug 920).
Diffstat (limited to 'src/common/Makefile.am')
-rw-r--r-- | src/common/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index ad54e1aaaa..78f73db25f 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,5 +1,5 @@ -noinst_LIBRARIES = libor.a libor-crypto.a +noinst_LIBRARIES = libor.a libor-crypto.a libor-event.a EXTRA_DIST = common_sha1.i @@ -14,8 +14,9 @@ endif libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \ memarea.c util_codedigest.c $(libor_extra_source) libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c +libor_event_a_SOURCES = compat_libevent.c -noinst_HEADERS = address.h log.h crypto.h test.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc +noinst_HEADERS = address.h log.h crypto.h test.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ |