[tor-commits] [orbot/master] adds obfsproxy to make all

[n8fr8@xxxxxxxxxxxxxx]

commit a5ad212ceaee3f933d95d982c501d2aa9437836e
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Fri May 4 18:03:18 2012 -0400

    adds obfsproxy to make all
---
 external/Makefile |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index aec1c67..ff420c6 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -186,12 +186,12 @@ obfsproxy-clean:
 #------------------------------------------------------------------------------#
 # privoxy
 
-privoxy/configure: 
-	cd privoxy && \
-	 ./autoheader
-	 ./autoconf
 
-privoxy/Makefile: privoxy/configure
+privoxy/Makefile:
+	cd privoxy && \
+	  autoheader
+	cd privoxy && \
+	  autoconf
 	cp config.sub privoxy
 	cp config.guess privoxy	
 	cd privoxy && \
@@ -232,17 +232,19 @@ jtorctrl-clean:
 
 #------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away
-assets: tor privoxy jtorctrl
+assets: tor privoxy jtorctrl obfsproxy
 	install -d ../res/raw
 	install -d ../libs
 	install bin/tor ../res/raw	
 	install bin/privoxy ../res/raw	
+	install bin/obfsproxy ../res/raw
 	install bin/jtorctrl.jar ../libs
 
 assets-clean:
 	-rm ../res/raw/tor
 	-rm ../res/raw/privoxy
 	-rm ../libs/jtorctrl.jar	
+	-rm ../res/raw/obfsproxy
 
 #------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits