diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-01 02:53:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-01 02:53:32 +0000 |
| commit | 8f94f0540fc4a1c5526d091fff955a5cdbdc9293 (patch) | |
| tree | cd1e9862aa0a9cff4828929d6299c777146aa459 /src | |
| parent | d5a23f38df7d7ebda0995a04e449a8e0a6173518 (diff) | |
| download | tor-8f94f0540fc4a1c5526d091fff955a5cdbdc9293.tar.gz tor-8f94f0540fc4a1c5526d091fff955a5cdbdc9293.zip | |
r12611@catbus: nickm | 2007-04-30 22:49:00 -0400
For reasons which make sense to somebody, I'm sure, mingw gcc wants the libraries to appear at the end of the command line. This is done by specifying them with LDADD in Makefile.am, not LDFLAGS.
If anybody can explain to me why mingw thinks "gcc -o foo foo.o -lbar" is fine, whereas "gcc -lbar -o foo foo.o" is Doubleplusbad UnMingwThink, I'd quite appreciate it. Until then, I'll just do what seems to work, and hope we don't blunder across any other great slumbering cthonian deities of arbitrary syntax.
svn:r10082
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/Makefile.am | 15 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 4d4186d966..411c062faf 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -13,10 +13,13 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \ eventdns.c \ tor_main.c -tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ \ - -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ -tor_LDADD = ../common/libor.a ../common/libor-crypto.a +# -L flags need to go in LDFLAGS. -l flags need to go in LDADD. +# This seems to matter nowhere but on windows, but I assure you that it +# matters a lot there, and is quite hard to debug if you forget to do it. +tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +tor_LDADD = ../common/libor.a ../common/libor-crypto.a \ + -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ circuituse.c command.c config.c \ connection.c connection_edge.c connection_or.c control.c \ @@ -27,9 +30,9 @@ 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_LIB_WS32@ @TOR_LIB_GDI@ -test_LDADD = ../common/libor.a ../common/libor-crypto.a + @TOR_LDFLAGS_libevent@ +test_LDADD = ../common/libor.a ../common/libor-crypto.a \ + -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 6d256a54a6..7d7f2c7b8f 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,11 +1,12 @@ bin_PROGRAMS = tor-resolve tor-gencert tor_resolve_SOURCES = tor-resolve.c -tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -levent @TOR_LIB_WS32@ -tor_resolve_LDADD = ../common/libor.a +tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ +tor_resolve_LDADD = ../common/libor.a -levent @TOR_LIB_WS32@ tor_gencert_SOURCES = tor-gencert.c tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ - @TOR_LDFLAGS_libevent@ -lz -lcrypto -levent \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ -tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a + @TOR_LDFLAGS_libevent@ +tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ + -lz -lcrypto -levent @TOR_LIB_WS32@ @TOR_LIB_GDI@ + |