Permalink
Browse files

Use scripted cloning for zerom2 so that zeromq version can be passed …

…through ZEROMQ_VERSION os env variable
  • Loading branch information...
1 parent 8daeaeb commit b7a25c1ff748f240ca59b508ba076dd3d55666ec @yrashk yrashk committed Mar 4, 2011
Showing with 20 additions and 8 deletions.
  1. +0 −3 .gitmodules
  2. +10 −4 Makefile
  3. +4 −0 README.md
  4. +0 −1 deps/zeromq2
  5. +6 −0 doc/overview.edoc
View
@@ -1,3 +0,0 @@
-[submodule "deps/zeromq2"]
- path = deps/zeromq2
- url = https://github.com/zeromq/zeromq2.git
View
@@ -7,12 +7,18 @@ else
ZMQ_FLAGS=
endif
+ifeq ($(ZEROMQ_VERSION),"")
+ZEROMQ_VERSION=master
+endif
+
all: perf
-deps/zeromq2/.git/HEAD:
- @git submodule init
- @git submodule update
-deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2/.git/HEAD
+deps/zeromq2:
+ @mkdir -p deps
+ @git clone git://github.com/zeromq/zeromq2.git deps/zeromq2
+ @cd deps/zeromq2 && git checkout $(ZEROMQ_VERSION)
+
+deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2
@cd deps/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
dependencies: deps/zeromq2/src/.libs/libzmq.a
View
@@ -28,6 +28,10 @@ Build the code
$ make
+If you want to build against a specific version of ZeroMQ (not `master`), use this:
+
+ $ ZEROMQ_VERSION=v<VERSION> make
+
Build the docs
$ make docs
Submodule zeromq2 deleted from 28f3e8
View
@@ -37,6 +37,12 @@ Build the code
$ make
'''
+If you want to build against a specific version of ZeroMQ (not `master`), use this:
+
+```
+ $ ZEROMQ_VERSION=v<VERSION> make
+'''
+
Build the docs
```
$ make docs

0 comments on commit b7a25c1

Please sign in to comment.