From ae7495dd55e0e3346e1e18eefbe6aa95dc6fdf33 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 30 Oct 2004 19:27:06 +0000
Subject: [PATCH] Only tor and test binaries need to link against openssl and
zlib; tor-resolve can be smaller.
svn:r2629
---
configure.in | 2 +-
src/common/Makefile.am | 5 +++--
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
--
GitLab