Makefile: Change make server to make, Change make to make dev (pingca…

…p#1517)

.gitignore

@@ -1,3 +1,4 @@
+bin
 /interpreter/interpreter
 /interpreter/test
 /parser/parser.go

Dockerfile

@@ -3,8 +3,8 @@ FROM golang:1.6
 COPY . /go/src/github.com/pingcap/tidb
 
 RUN cd /go/src/github.com/pingcap/tidb && \
-    make parser && make server && \
-    mv tidb-server/tidb-server /tidb-server && \
+    make && \
+    mv bin/tidb-server /tidb-server && \
     make clean
 
 EXPOSE 4000

Makefile

@@ -37,9 +37,11 @@ LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=$(shell git rev-
 
 TARGET = ""
 
-.PHONY: all build install update parser clean todo test gotest interpreter server goyacc golex
+.PHONY: all build install update parser clean todo test gotest interpreter server goyacc golex dev
 
-all: parser build test check
+all: server
+
+dev: parser build test check
 
 build:
 	rm -rf vendor && ln -s _vendor/vendor vendor
@@ -132,10 +134,10 @@ interpreter:
 server: parser
 ifeq ($(TARGET), "")
 	rm -rf vendor && ln -s _vendor/vendor vendor
-	@cd tidb-server && $(GO) build -ldflags '$(LDFLAGS)'
+	$(GO) build -ldflags '$(LDFLAGS)' -o bin/tidb-server tidb-server/main.go
 	rm -rf vendor
 else
 	rm -rf vendor && ln -s _vendor/vendor vendor
-	@cd tidb-server && $(GO) build -ldflags '$(LDFLAGS)' -o '$(TARGET)'
+	$(GO) build -ldflags '$(LDFLAGS)' -o '$(TARGET)' tidb-server/main.go
 	rm -rf vendor
 endif

docs/QUICKSTART.md

@@ -47,8 +47,8 @@ Press `Ctrl+C` to quit.
 #### __Run as MySQL protocol server__
 
 ```
-make server
-cd tidb-server && ./tidb-server
+make
+cd bin && ./tidb-server
 ```
 
 In case you want to compile a specific location: