[tor-commits] [torbrowser/master] Give build-obfsproxy target proper deps and CFLAGS

[erinn@xxxxxxxxxxxxxx]

commit d78759c2236c5170391d0665538a324227f70e3d
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Tue Sep 4 15:25:42 2012 +0200

    Give build-obfsproxy target proper deps and CFLAGS
    
    This is required for builds of the non-native architecture, and also to
    make sure calling make build-obfsproxy actually does the right thing.
---
 build-scripts/osx-alpha.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 69b6708..58a8ce1 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -117,7 +117,8 @@ TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VE
 TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)"
 TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC)
 
-build-obfsproxy: $(OBFSPROXY_DIR)
+OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)"
+build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR)
 ifeq ($(USE_OBFSPROXY),1)
 	cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR)
 	cd $(OBFSPROXY_DIR) && make



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