[tor-commits] [orbot/master] update makefile for new install process

[n8fr8 at torproject.org]

commit 4d6e0cca9689e30643fceb8f6022ea82e392f568
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Dec 27 11:14:11 2013 -0500

    update makefile for new install process
    update tags for libevent and tor
---
 external/Makefile |   18 +++++++++---------
 external/libevent |    2 +-
 external/tor      |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 72da8a1..17466ae 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -300,20 +300,20 @@ jtorctl-clean:
 #this is related to a bug in compression of assets and resources > 1MB
 
 assets: tor privoxy jtorctl obfsproxy simple
-	install -d ../res/raw
+	install -d ../libs/armeabi
 	install -d ../libs
-	install bin/privoxy ../res/raw	
-	install bin/obfsproxy ../res/raw
+	install bin/privoxy ../libs/armeabi/libprivoxy.so
+	install bin/obfsproxy ../libs/armeabi/libobfsproxy.so
 	install bin/jtorctl.jar ../libs
 	install bin/simple.jar ../libs
-	cd bin && \
-		zip ../../res/raw/tor.mp3 tor
+	install bin/tor ../libs/armeabi/libtor.so
 
 assets-clean:
-	-rm ../res/raw/tor.mp3
-	-rm ../res/raw/privoxy
-	-rm ../libs/*
-	-rm ../res/raw/obfsproxy
+	-rm ../libs/armeabi/libtor.so
+	-rm ../libs/armeabi/libprivoxy.so
+	-rm ../libs/armeabi/libobfsproxy.so
+	-rm ../libs/jtorctl.jar
+	-rm ../libs/simple.jar
 
 #------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away
diff --git a/external/libevent b/external/libevent
index 5a12d83..ce46db9 160000
--- a/external/libevent
+++ b/external/libevent
@@ -1 +1 @@
-Subproject commit 5a12d8359727e8f10d08f8cd2b36c9f78747908f
+Subproject commit ce46db99b94389a8fed0248f64f88d047cdac416
diff --git a/external/tor b/external/tor
index 889e9bd..e719d05 160000
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 889e9bd5292972842eb6d02dbce2c6589dd3ccfe
+Subproject commit e719d05fd296a9dd59af9becb21ef3ff1c426b3c