[tor-commits] [orbot/master] added missing path to libevent include

[n8fr8 at torproject.org]

commit 1748cb49e268e1ff2f0d716af3f6e8689f21628d
Author: n8fr8 <nathan at freitas.net>
Date:   Tue Feb 12 13:44:09 2013 +0700

    added missing path to libevent include
---
 external/Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 4d3dd1d..300a465 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -109,10 +109,10 @@ libevent: openssl-static libevent-build-stamp
 	test -d lib || mkdir lib
 	test -d include || mkdir include
 	cp libevent/.libs/libevent.a lib
-	cp -R libevent/include/* include
+	cp -R libevent/include/event2 include
 
 libevent-clean:
-	-rm -f include/*.h
+	-rm -f include/event2
 	-rm -f lib/libevent.a
 	-rm -f libevent-build-stamp
 	-cd libevent && \
@@ -153,7 +153,7 @@ tor/Makefile: tor/configure
 	cp config.guess tor
 	cd tor && \
                 CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(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" \
+                        LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \
                         ./configure \
                                 --host=$(HOST) \
                                 --prefix=$(NDK_TOOLCHAIN) \
@@ -280,7 +280,6 @@ assets: tor privoxy jtorctl obfsproxy
 		zip ../../res/raw/tor.mp3 tor
 
 assets-clean:
-	-rm ../res/raw/tor
 	-rm ../res/raw/tor.mp3
 	-rm ../res/raw/privoxy
 	-rm ../libs/*