[tor-commits] [orbot/master] updated to only build tor binary and not tests, etc

[n8fr8 at torproject.org]

commit 06b46f1a358e44fee2104ff69d7b6249b933cadd
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon Mar 24 14:18:23 2014 -0400

    updated to only build tor binary and not tests, etc
---
 external/Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 71b2a73..1b273cf 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -195,7 +195,7 @@ tor/Makefile: tor/configure
 				--disable-linker-hardening --disable-gcc-hardening 
 
 tor-build-stamp: tor/Makefile
-	$(MAKE) -C tor 
+	$(MAKE) -C tor all-am
 	touch tor-build-stamp
 
 tor: libevent openssl tor-build-stamp
@@ -252,7 +252,8 @@ obfsclient/Makefile:
 	cp config.sub obfsclient
 	cp config.guess obfsclient
 	cd obfsclient && \
-                CPP="$(CPP)" AR="$(AR)" RANLIB=$(RANLIB) CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \
+                CPP="$(CPP)" CXX="$(CXX)" AR="$(AR)" RANLIB=$(RANLIB) CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" CXXFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \
+ LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \
                         ./configure \
                                 --host=$(HOST) \