diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-01 01:36:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-01 01:36:32 +0000 |
| commit | fa39336e65fdc24507976ff490fd366ebefc9c46 (patch) | |
| tree | c6de285f76132a75c400620bb487a62325cd43d0 /src/or/Makefile.am | |
| parent | bbd4ef1cd1f0fb2f2c7b9cab3abbff052d04716f (diff) | |
| download | tor-fa39336e65fdc24507976ff490fd366ebefc9c46.tar.gz tor-fa39336e65fdc24507976ff490fd366ebefc9c46.zip | |
r12607@catbus: nickm | 2007-04-30 21:36:28 -0400
More attempt to fix win32 building. This time, with extra linking.
svn:r10080
Diffstat (limited to 'src/or/Makefile.am')
| -rw-r--r-- | src/or/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 93f9edb198..4d4186d966 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -13,9 +13,8 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \ eventdns.c \ tor_main.c -tor_LIBS = -lz -levent -lssl -lcrypto tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ \ - -lz -levent -lssl -lcrypto + -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ tor_LDADD = ../common/libor.a ../common/libor-crypto.a test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ @@ -28,7 +27,8 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ test.c test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ - @TOR_LDFLAGS_libevent@ -lz -levent -lssl -lcrypto + @TOR_LDFLAGS_libevent@ -lz -levent -lssl -lcrypto \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ test_LDADD = ../common/libor.a ../common/libor-crypto.a noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i @@ -36,7 +36,7 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @if test -d ../../.svn ; then \ + @if test -d ../../.svn -a x`which svn` != x ; then \ svn info ../.. | \ sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.i \ || true; \ |