diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-01-24 15:03:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-01-24 15:03:45 -0500 |
| commit | 0552deb613ab9872462f10b07f490df60f8e1c22 (patch) | |
| tree | d25aeb97068eac095c5d67505addae2762a46fa4 /src | |
| parent | 3b4b6009a0020fb55fcb6464cc448e244680f9c8 (diff) | |
| parent | b6038f4ac646b52f0819724b344adcf04bc2a440 (diff) | |
| download | tor-0552deb613ab9872462f10b07f490df60f8e1c22.tar.gz tor-0552deb613ab9872462f10b07f490df60f8e1c22.zip | |
Merge commit 'origin/maint-0.2.1'
Resolved conflicts in:
configure.in
src/or/Makefile.am
src/tools/Makefile.am
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/Makefile.am | 2 | ||||
| -rw-r--r-- | src/test/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 3dc1889a90..cfa8a035ad 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -43,7 +43,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - -lz -lm -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i diff --git a/src/test/Makefile.am b/src/test/Makefile.am index cdb5d85c28..7df13da51e 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -25,6 +25,6 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - -lz -lm -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = tinytest.h tinytest_macros.h test.h diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 39c8277ccd..be03f8d892 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -3,16 +3,16 @@ noinst_PROGRAMS = tor-checkkey tor_resolve_SOURCES = tor-resolve.c tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@ +tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@ tor_gencert_SOURCES = tor-gencert.c tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lm -lz @TOR_LIBEVENT_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_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lm -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ |