Skip to content

Commit

Permalink
makefile fixes
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
  • Loading branch information
whyrusleeping committed Feb 5, 2016
1 parent ffc4831 commit c9b83c5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ deps: gx
vendor: godep
godep save -r ./...

install: deps
install: build
cd cmd/ipfs && go install -ldflags=$(ldflags)

build:
build: deps
cd cmd/ipfs && go build -i -ldflags=$(ldflags)

nofuse:

This comment has been minimized.

Copy link
@hackergrrl

hackergrrl Feb 5, 2016

Contributor

nofuse needs deps too

Expand Down
17 changes: 4 additions & 13 deletions cmd/ipfs/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
all: install
commit = $(shell git rev-parse --short HEAD 2> /dev/null || echo unknown)
ldflags = "-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(commit)"

gx:
go get -u github.com/whyrusleeping/gx
go get -u github.com/whyrusleeping/gx-go
build:
cd ../../ && make build

This comment has been minimized.

Copy link
@hackergrrl

hackergrrl Feb 5, 2016

Contributor

yay 👍 for reduced redundancy


deps: gx
gx --verbose install --global

build: deps
go build -ldflags=$(ldflags)

install: build
go install
install:
cd ../../ && make install

0 comments on commit c9b83c5

Please sign in to comment.