 -	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
 -	src/common/libor-event.a src/trunnel/libor-trunnel.a \
 -	src/trace/libor-trace.a \
--	$(rust_ldadd) \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
--	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
--	@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
--	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
+-	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+-	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+-	$(rust_ldadd)
 -
 -if COVERAGE_ENABLED
 -src_or_tor_cov_SOURCES = src/or/tor_main.c

--- src/or/include.am.orig	2017-09-25 18:07:25.586777155 +0200
+++ src/or/include.am	2017-09-25 18:12:20.888149292 +0200
@@ -1,13 +1,5 @@
-bin_PROGRAMS+= src/or/tor
 noinst_LIBRARIES += \

 
 if BUILD_NT_SERVICES
 tor_platform_source=src/or/ntmain.c
@@ -97,50 +89,16 @@
 	$(tor_platform_source)
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
