diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/common/Makefile.am | 5 | ||||
| -rw-r--r-- | src/or/Makefile.am | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 209eeee660..d8fc5a6374 100644 --- a/configure.in +++ b/configure.in @@ -135,7 +135,7 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; fi fi fi -LIBS="$saved_LIBS -lssl -lcrypto" +LIBS="$saved_LIBS" dnl The warning message here is no longer strictly accurate. diff --git a/src/common/Makefile.am b/src/common/Makefile.am index cf18c3fecd..c07f08355e 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,8 +1,9 @@ -noinst_LIBRARIES = libor.a +noinst_LIBRARIES = libor.a libor-crypto.a #CFLAGS = -Wall -Wpointer-arith -O2 -libor_a_SOURCES = log.c crypto.c fakepoll.c util.c aes.c tortls.c torgzip.c +libor_a_SOURCES = log.c fakepoll.c util.c +libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c noinst_HEADERS = log.h crypto.h fakepoll.h test.h util.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a1b956b4aa..edbb4c8653 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -12,7 +12,7 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \ rendservice.c rephist.c router.c routerlist.c routerparse.c \ tor_main.c -tor_LDADD = ../common/libor.a -lz +tor_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ circuituse.c command.c config.c \ @@ -22,7 +22,7 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ rendservice.c rephist.c router.c routerlist.c routerparse.c \ test.c -test_LDADD = ../common/libor.a -lz +test_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto noinst_HEADERS = or.h tree.h |