build: update Makefile to avoid godep warning

This commit is contained in:
fatedier 2016-04-11 11:21:35 +08:00
parent d5913fc77b
commit 7c3e00ed28
3 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,5 @@
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(PATH)
export NEW_GOPATH := $(shell pwd) export GOPATH := $(shell pwd):$(GOPATH)
all: build all: build
@ -9,13 +9,13 @@ godep:
@go get github.com/tools/godep @go get github.com/tools/godep
fmt: fmt:
GOPATH=$(NEW_GOPATH) godep go fmt ./... godep go fmt ./...
frps: frps:
GOPATH=$(NEW_GOPATH) godep go build -o bin/frps ./src/frp/cmd/frps godep go build -o bin/frps ./src/frp/cmd/frps
frpc: frpc:
GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc godep go build -o bin/frpc ./src/frp/cmd/frpc
test: test:
@GOPATH=$(NEW_GOPATH) godep go test -v ./... godep go test -v ./...

View File

@ -3,9 +3,9 @@
server_addr = 0.0.0.0 server_addr = 0.0.0.0
server_port = 7000 server_port = 7000
# console or real logFile path like ./frpc.log # console or real logFile path like ./frpc.log
log_file = console log_file = ./frpc.log
# debug, info, warn, error # debug, info, warn, error
log_level = debug log_level = info
# for authentication # for authentication
auth_token = 123 auth_token = 123

View File

@ -3,9 +3,9 @@
bind_addr = 0.0.0.0 bind_addr = 0.0.0.0
bind_port = 7000 bind_port = 7000
# console or real logFile path like ./frps.log # console or real logFile path like ./frps.log
log_file = console log_file = ./frps.log
# debug, info, warn, error # debug, info, warn, error
log_level = debug log_level = info
# test1 is the proxy name, client will use this name and auth_token to connect to server # test1 is the proxy name, client will use this name and auth_token to connect to server
[test1] [test1]