X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=1d1e07d98f51fb66c5fc29b28ec27388760adbb9;hb=228292f1a8b2758cca63c934fdb0762377e5b31a;hp=22b954a2c302a8514e2531345eb7258eb208f3cb;hpb=53f2a0c56e9604b8ac5cff73e62fc387c4676365;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index 22b954a..1d1e07d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,11 @@
 # Makefile used to build XDS daemon Web Server
 
 # Application Version
-VERSION := 0.0.1
+VERSION := 0.1.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.28
-# FIXME: use patched version while waiting integration of #165
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION = master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
 
 
 
@@ -25,10 +23,12 @@ ifeq ($(origin SUB_VERSION), undefined)
 	endif
 endif
 
+# for backward compatibility
+DESTDIR := $(INSTALL_DIR)
 
 # Configurable variables for installation (default /usr/local/...)
-ifeq ($(origin INSTALL_DIR), undefined)
-	INSTALL_DIR := /usr/local/bin
+ifeq ($(origin DESTDIR), undefined)
+	DESTDIR := /usr/local/bin
 endif
 
 HOST_GOOS=$(shell go env GOOS)
@@ -71,9 +71,9 @@ else
 endif
 
 
-all: tools/syncthing build
+all: tools/syncthing vendor build
 
-build: vendor tools/syncthing/copytobin
+build: tools/syncthing/copytobin
 	@echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
@@ -93,13 +93,13 @@ package-all:
 	GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
 
 test: tools/glide
-	go test --race $(shell ./tools/glide novendor)
+	go test --race $(shell ./tools/linux/glide novendor)
 
 vet: tools/glide
-	go vet $(shell ./tools/glide novendor)
+	go vet $(shell ./tools/linux/glide novendor)
 
 fmt: tools/glide
-	go fmt $(shell ./tools/glide novendor)
+	go fmt $(shell ./tools/linux/glide novendor)
 
 run: build/xds tools/syncthing/copytobin
 	$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
@@ -117,15 +117,18 @@ distclean: clean
 
 .PHONY: install
 install: all
-	mkdir -p $(INSTALL_DIR) && cp $(LOCAL_BINDIR)/* $(INSTALL_DIR)
+	mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
 
 vendor: tools/glide glide.yaml
-	./tools/glide install --strip-vendor
+	./tools/linux/glide install --strip-vendor
 
+.PHONY: tools/glide
 tools/glide:
-	@echo "Downloading glide"
-	mkdir -p tools
-	curl --silent -L https://glide.sh/get | GOBIN=./tools  sh
+	@test -f $(LOCAL_TOOLSDIR)/glide || { \
+		echo "Downloading glide"; \
+		mkdir -p $(LOCAL_TOOLSDIR); \
+		curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+	}
 
 .PHONY: tools/syncthing
 tools/syncthing:
@@ -145,7 +148,8 @@ tools/syncthing/copytobin:
 .PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  build               (default)"
+	@echo "  all               (default)"
+	@echo "  build
 	@echo "  package"
 	@echo "  install"
 	@echo "  clean"