X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d088c5d5c0bd203c1333bbd32973bbf81efcad33;hb=e9b18cd409f82928e1c4de3029ee1cc2d3816552;hp=29a33a824ee3f58cd14f5af69510c3c9232594c4;hpb=d21eb59c4f7fe9844646bd60ac34aa1d3cbb792f;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 29a33a8..d088c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ ifeq ($(origin SUB_VERSION), undefined)
 		VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
 		SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
 	else
-		SUB_VERSION := $(shell git describe --tags --always  | sed 's/^v//')
+		SUB_VERSION := $(shell git rev-parse --short HEAD)
 		ifeq ($(SUB_VERSION), )
 			SUB_VERSION := unknown-dev
 		endif
@@ -55,7 +55,6 @@ LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
 LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
 
-
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
 export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
@@ -82,9 +81,9 @@ endif
 all: tools/syncthing build
 
 .PHONY: build
-build: xds webapp
+build: vendor xds webapp
 
-xds:vendor scripts tools/syncthing/copytobin
+xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .