Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix makefile targets so 'deps' doesn't get called for each devrel

Due to the structure of the targets, `make` couldn't figure
out that `deps` was already called.  This causes `deps` (the
longest operation) to be called each devrel slowing down
the build considerably.
  • Loading branch information...
commit f0d619e1c7d83bd3564093a428d1c60a47c19707 1 parent da0c55a
@jaredmorrow jaredmorrow authored
Showing with 7 additions and 10 deletions.
  1. +7 −10 Makefile
View
17 Makefile
@@ -38,7 +38,7 @@ test: deps compile testclean
##
## Release targets
-##
+##
rel: deps compile generate riaknostic-rel
relclean:
@@ -51,14 +51,10 @@ riaknostic: deps
$(MAKE) -C deps/riaknostic -f Makefile
riaknostic-rel: riaknostic
- rm -rf rel/riak/lib/riaknostic && \
- mkdir -p rel/riak/lib/riaknostic && \
+ rm -rf rel/riak/lib/riaknostic
+ mkdir -p rel/riak/lib/riaknostic
cp -f deps/riaknostic/riaknostic rel/riak/lib/riaknostic/
-riaknostic-%: riaknostic
- rm -rf dev/$*/lib/riaknostic && \
- mkdir -p dev/$*/lib/riaknostic && \
- cp -f deps/riaknostic/riaknostic dev/$*/lib/riaknostic/
##
## Developer targets
@@ -80,11 +76,12 @@ SEQ = $(shell awk 'BEGIN { for (i = 1; i < '$(DEVNODES)'; i++) printf("%i ", i);
$(eval stagedevrel : $(foreach n,$(SEQ),stagedev$(n)))
$(eval devrel : $(foreach n,$(SEQ),dev$(n)))
-dev% : all
+dev% : all riaknostic
mkdir -p dev
rel/gen_dev $@ rel/vars/dev_vars.config.src rel/vars/$@_vars.config
- (cd rel && ../rebar generate target_dir=../dev/$@ overlay_vars=vars/$@_vars.config) && \
- $(MAKE) riaknostic-$@
+ (cd rel && ../rebar generate target_dir=../dev/$@ overlay_vars=vars/$@_vars.config)
+ mkdir -p dev/$@/lib/riaknostic
+ cp -f deps/riaknostic/riaknostic dev/$@/lib/riaknostic/
stagedev% : dev%
$(foreach dep,$(wildcard deps/*), rm -rf dev/$^/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) dev/$^/lib;)
Please sign in to comment.
Something went wrong with that request. Please try again.