Commit ae7495dd authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Only tor and test binaries need to link against openssl and zlib; tor-resolve can be smaller. 


svn:r2629
parent 5bc0dba9

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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.

src/common/Makefile.am

+3 −2
Original line number Diff line number Diff line 


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

src/or/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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