From f870de867b43bfb1220067f81c11395438fb2863 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 6 Jul 2018 11:20:51 +0200 Subject: [PATCH] Minor fixes in Makefile Change-Id: I24d971fb254afccb1ed65d412729b32ca53d251e Signed-off-by: Sebastien Douheret --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bf711af..d4f86b2 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ endif HOST_GOOS=$(shell go env GOOS) HOST_GOARCH=$(shell go env GOARCH) ARCH=$(HOST_GOOS)-$(HOST_GOARCH) -REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/xds-server +REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET) EXT= ifeq ($(HOST_GOOS), windows) @@ -129,18 +129,18 @@ fmt: tools/glide go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor) run: build/xds tools/syncthing/copytobin - $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_SERVER_RUN_ARS) + $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_SERVER_RUN_ARGS) debug: build/xds tools/syncthing/copytobin $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_SERVER_DEBUG_ARGS) .PHONY: clean clean: - rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR) + rm -rf $(LOCAL_BINDIR)/* $(ROOT_SRCDIR)/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR) .PHONY: distclean distclean: clean - rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/node_modules + (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules) webapp: webapp/install mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts -- 2.16.6