makefile fixes
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Feb 5, 2016 at 15:50 UTC
c9b83c506c6dd416070674c76a57acaaa7636afa
2 files changed
+6
-15
Makefile
+2
-2
@@ -27,10 +27,10 @@ deps: gx
27
vendor: godep
28
godep save -r ./...
29
30
-install: deps
30
+install: build
31
cd cmd/ipfs && go install -ldflags=$(ldflags)
32
33
-build:
33
+build: deps
34
cd cmd/ipfs && go build -i -ldflags=$(ldflags)
35
36
nofuse:
cmd/ipfs/Makefile
+4
-13
@@ -1,16 +1,7 @@
1
all: install
2
-commit = $(shell git rev-parse --short HEAD 2> /dev/null || echo unknown)
3
-ldflags = "-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(commit)"
2
5
-gx:
6
- go get -u github.com/whyrusleeping/gx
7
- go get -u github.com/whyrusleeping/gx-go
3
+build:
4
+ cd ../../ && make build
5
9
-deps: gx
10
- gx --verbose install --global
11
-
12
-build: deps
13
- go build -ldflags=$(ldflags)
14
-
15
-install: build
16
- go install
6
+install:
7
+ cd ../../ && make install