dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added missing path to libevent include

This commit is contained in:
n8fr8 2013-02-12 13:44:09 +07:00
parent fb0a0fad34
commit 1748cb49e2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/Makefile vendored
View File

@ -109,10 +109,10 @@ libevent: openssl-static libevent-build-stamp
test -d lib || mkdir lib test -d lib || mkdir lib
test -d include || mkdir include test -d include || mkdir include
cp libevent/.libs/libevent.a lib cp libevent/.libs/libevent.a lib
cp -R libevent/include/* include cp -R libevent/include/event2 include
libevent-clean: libevent-clean:
-rm -f include/*.h -rm -f include/event2
-rm -f lib/libevent.a -rm -f lib/libevent.a
-rm -f libevent-build-stamp -rm -f libevent-build-stamp
-cd libevent && \ -cd libevent && \
@ -153,7 +153,7 @@ tor/Makefile: tor/configure
cp config.guess tor cp config.guess tor
cd 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)" \ 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 \ ./configure \
--host=$(HOST) \ --host=$(HOST) \
--prefix=$(NDK_TOOLCHAIN) \ --prefix=$(NDK_TOOLCHAIN) \
@ -280,7 +280,6 @@ assets: tor privoxy jtorctl obfsproxy
zip ../../res/raw/tor.mp3 tor zip ../../res/raw/tor.mp3 tor
assets-clean: assets-clean:
-rm ../res/raw/tor
-rm ../res/raw/tor.mp3 -rm ../res/raw/tor.mp3
-rm ../res/raw/privoxy -rm ../res/raw/privoxy
-rm ../libs/* -rm ../libs/*