Skip to content

Commit

Permalink
Moving deps back to the top level project directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Smith committed Jun 12, 2011
1 parent 2b57f69 commit 4122ef0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions c_src/Makefile
@@ -1,5 +1,5 @@
LINUX=$(shell uname | grep Linux | wc -l | xargs echo)

DEPS=../deps

ifeq ($(LINUX),1)
ZMQ_FLAGS=--with-pic
Expand All @@ -11,19 +11,19 @@ ifndef ZEROMQ_VERSION
ZEROMQ_VERSION=v2.1.7
endif

all: deps/zeromq2/src/.libs/libzmq.a
all: $(DEPS)/zeromq2/src/.libs/libzmq.a

clean:
@cd deps/zeromq2; make clean
@cd $(DEPS)/zeromq2; make clean

distclean:
@rm -rf deps
@rm -rf $(DEPS)

deps/zeromq2:
@mkdir -p deps
@git clone git://github.com/zeromq/zeromq2-1.git deps/zeromq2
$(DEPS)/zeromq2:
@mkdir $(DEPS)
@git clone git://github.com/zeromq/zeromq2-1.git $(DEPS)/zeromq2
@echo $(ZEROMQ_VERSION)
@cd deps/zeromq2 && git checkout $(ZEROMQ_VERSION)
@cd $(DEPS)/zeromq2 && git checkout $(ZEROMQ_VERSION)

deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2
@cd deps/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
$(DEPS)/zeromq2/src/.libs/libzmq.a: $(DEPS)/zeromq2
@cd $(DEPS)/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
6 changes: 3 additions & 3 deletions rebar.config
@@ -1,9 +1,9 @@
{erl_opts, [debug_info, warnings_as_errors]}.

{port_envs,
[{"DRV_LDFLAGS","c_src/deps/zeromq2/src/.libs/libzmq.a -shared $ERL_LDFLAGS -lstdc++ -luuid"},
{"darwin", "DRV_LDFLAGS", "c_src/deps/zeromq2/src/.libs/libzmq.a -bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
{"DRV_CFLAGS","-Ic_src -Ic_src/deps/zeromq2/include -g -Wall -fPIC $ERL_CFLAGS"}]}.
[{"DRV_LDFLAGS","deps/zeromq2/src/.libs/libzmq.a -shared $ERL_LDFLAGS -lstdc++ -luuid"},
{"darwin", "DRV_LDFLAGS", "deps/zeromq2/src/.libs/libzmq.a -bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
{"DRV_CFLAGS","-Ic_src -Ideps/zeromq2/include -g -Wall -fPIC $ERL_CFLAGS"}]}.

{pre_hooks,[{compile,"make -C c_src"},
{clean, "make -C c_src clean"}]}.

0 comments on commit 4122ef0

Please sign in to comment.