[tor-commits] [orbot/master] added cleanup and build fixes

[n8fr8]

commit 2240c31d5f943f518d3d9f9b31956c968be647c1
Author: n8fr8 <nat...@freitas.net>
Date:   Thu May 3 19:10:41 2012 -0400

    added cleanup and build fixes
---
 external/Makefile |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 66ea64a..f24d7d2 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -61,6 +61,8 @@ openssl-static/obj/local/armeabi/libcrypto.a:
                ndk-build
 
 openssl-static/obj/local/armeabi/libssl.a:
+       cp config.sub openssl-static
+       cp config.guess openssl-static
        cd openssl-static && \
                ndk-build
 
@@ -86,10 +88,10 @@ openssl-static-clean:
 
 libevent/configure: 
        cd libevent && ./autogen.sh
-       cp config.sub libevent
-       cp config.guess libevent
 
 libevent/Makefile: libevent/configure
+       cp config.sub libevent
+       cp config.guess libevent
        cd libevent && \
                CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" \
                        ./configure \
@@ -124,6 +126,8 @@ tor/configure:
        cp config.guess tor
 
 tor/Makefile: tor/configure
+       cp config.sub tor
+       cp config.guess tor
        cd tor && \
                 CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" \
                         ./configure \
@@ -155,10 +159,10 @@ privoxy/configure:
        cd privoxy && \
         ./autoheader
         ./autoconf
-       cp config.sub privoxy
-       cp config.guess privoxy 
 
 privoxy/Makefile: privoxy/configure
+       cp config.sub privoxy
+       cp config.guess privoxy 
        cd privoxy && \
                 CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" \
                         ./configure \
@@ -173,6 +177,7 @@ privoxy: privoxy-build-stamp
        cp privoxy/privoxy bin
 
 privoxy-clean:
+       $(MAKE) -C privoxy clean
        -rm -f bin/privoxy
        -rm -f privoxy-build-stamp
        -rm -f privoxy/config.status
@@ -202,9 +207,13 @@ assets: tor privoxy jtorctrl
        install bin/tor ../res/raw      
        install bin/privoxy ../res/raw  
        install bin/jtorctrl.jar ../libs
-       
+
+assets-clean:
+       -rm ../res/raw/tor
+       -rm ../res/raw/privoxy
+       -rm ../libs/jtorctrl.jar        
 
 
#------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away
 
-clean: openssl-static-clean libevent-clean tor-clean privoxy-clean 
jtorctrl-clean
+clean: openssl-static-clean libevent-clean tor-clean privoxy-clean 
jtorctrl-clean assets-clean



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