Skip to content

Commit

Permalink
Merge pull request #35 from prometheus/fix-makefile-parallelism
Browse files Browse the repository at this point in the history
Fix makefile parallelism
  • Loading branch information
juliusv committed Feb 23, 2015
2 parents 66df343 + 8655ec1 commit adbefc4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default: $(BINARY)

.deps/$(GOPKG):
mkdir -p .deps
curl -o .deps/$(GOPKG) -L $(GOURL)/$(GOPKG)
curl -q -o .deps/$(GOPKG) -L $(GOURL)/$(GOPKG)

$(GOCC): .deps/$(GOPKG)
tar -C .deps -xzf .deps/$(GOPKG)
Expand All @@ -27,13 +27,13 @@ $(SELFLINK):
mkdir -p $(GOPATH)/src/github.com/prometheus
ln -s $(CURDIR) $(SELFLINK)

dependencies: $(SELFLINK) web config
dependencies: $(GOCC) $(SELFLINK) web config
$(GO) get -d

config:
$(MAKE) -C config

web:
web: $(GOCC)
$(MAKE) -C web

$(BINARY): $(GOCC) dependencies
Expand Down

0 comments on commit adbefc4

Please sign in to comment.