this is it! rise of the MegaMakeZilla! Woot!

This commit is contained in:
n8fr8 2012-05-03 18:46:17 -04:00
parent d3a82e8760
commit 3f45a45b69
1 changed files with 16 additions and 4 deletions

20
external/Makefile vendored
View File

@ -51,7 +51,7 @@ LDFLAGS = -L$(LOCAL)/lib
CFLAGS += -fdata-sections -ffunction-sections -Os CFLAGS += -fdata-sections -ffunction-sections -Os
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
all: openssl-static libevent tor privoxy all: assets
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# openssl-static # openssl-static
@ -133,7 +133,7 @@ tor-build-stamp: tor/Makefile
$(MAKE) -C tor $(MAKE) -C tor
touch tor-build-stamp touch tor-build-stamp
tor: tor-build-stamp libevent openssl-static tor: libevent openssl-static tor-build-stamp
test -d bin || mkdir bin test -d bin || mkdir bin
cp tor/src/or/tor bin cp tor/src/or/tor bin
@ -181,12 +181,24 @@ jtorctrl:
test -d jtorctl/bin || mkdir jtorctl/bin test -d jtorctl/bin || mkdir jtorctl/bin
cd jtorctl && \ cd jtorctl && \
javac net/freehaven/tor/control/TorControlConnection.java -d bin javac net/freehaven/tor/control/TorControlConnection.java -d bin
jar cvf bin/jtorctrl.jar jtorctl/bin/* cd jtorctl/bin && \
jar cvf jtorctrl.jar *
cp jtorctl/bin/jtorctrl.jar bin
jtorctrl-clean: jtorctrl-clean:
-rm bin/jtorctrl.jar -rm bin/jtorctrl.jar
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# cleanup, cleanup, put the toys away # cleanup, cleanup, put the toys away
assets: tor privoxy jtorctrl
install -d ../res/raw
install -d ../libs
install bin/tor ../res/raw
install bin/privoxy ../res/raw
install bin/jtorctrl.jar ../libs
clean: openssl-static-clean libevent-clean tor-clean privoxy-clean #------------------------------------------------------------------------------#
# cleanup, cleanup, put the toys away
clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctrl-clean