torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r12607@catbus: nickm | 2007-04-30 21:36:28 -0400

Browse Source 
More attempt to fix win32 building.  This time, with extra linking.


svn:r10080
This commit is contained in:
Nick Mathewson
2007-05-01 01:36:32 +00:00
parent bbd4ef1cd1
commit fa39336e65
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/log.c
+1
View File
@@ -652,6 +652,7 @@ configure_libevent_logging(void)
void
suppress_libevent_log_msg(const char *msg)
{
(void)msg;
}
#endif
src/or/Makefile.am
+4 -4
View File
@@ -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; \
src/tools/Makefile.am
+3 -2
View File
@@ -1,10 +1,11 @@
bin_PROGRAMS = tor-resolve tor-gencert
tor_resolve_SOURCES = tor-resolve.c
tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -levent
tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -levent @TOR_LIB_WS32@
tor_resolve_LDADD = ../common/libor.a
tor_gencert_SOURCES = tor-gencert.c
tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@ -lz -lcrypto -levent
@TOR_LDFLAGS_libevent@ -lz -lcrypto -levent \
@TOR_LIB_WS32@ @TOR_LIB_GDI@
tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a