[minor] cosmetic changes to Makefile

This commit is contained in:
Aaron Meihm 2016-12-22 10:33:29 -06:00
Родитель 36a29cf814
Коммит 214063a334
1 изменённых файлов: 21 добавлений и 21 удалений

Просмотреть файл

@ -71,13 +71,6 @@ AVAILMOD_PATHS := mig-agent/available_modules.go client/mig/available_modules.go
MSICONF := mig-agent-installer.wxs MSICONF := mig-agent-installer.wxs
SIGNFLAGS := SIGNFLAGS :=
GCC := gcc
CFLAGS :=
LDFLAGS :=
GOOPTS :=
GO := GOOS=$(OS) GOARCH=$(ARCH) GO15VENDOREXPERIMENT=1 go
GOGETTER := GOPATH=$(shell pwd)/.tmpdeps go get -d
MIGVERFLAGS := -X mig.ninja/mig.Version=$(BUILDREV)
# If code signing is enabled for OSX binaries, pass the -s flag during linking # If code signing is enabled for OSX binaries, pass the -s flag during linking
# otherwise the signed binary will not execute correctly # otherwise the signed binary will not execute correctly
# https://github.com/golang/go/issues/11887 # https://github.com/golang/go/issues/11887
@ -86,12 +79,19 @@ ifeq ($(OS),darwin)
STRIPOPT := -s STRIPOPT := -s
endif endif
endif endif
GCC := gcc
CFLAGS :=
LDFLAGS :=
GOOPTS :=
GO := GOOS=$(OS) GOARCH=$(ARCH) GO15VENDOREXPERIMENT=1 go
GOGETTER := GOPATH=$(shell pwd)/.tmpdeps go get -d
MIGVERFLAGS := -X mig.ninja/mig.Version=$(BUILDREV)
GOLDFLAGS := -ldflags "$(MIGVERFLAGS) $(STRIPOPT)" GOLDFLAGS := -ldflags "$(MIGVERFLAGS) $(STRIPOPT)"
GOCFLAGS := GOCFLAGS :=
MKDIR := mkdir MKDIR := mkdir
INSTALL := install INSTALL := install
all: test mig-agent mig-scheduler mig-api mig-cmd mig-console mig-runner mig-action-generator mig-action-verifier worker-agent-intel \ all: test mig-agent mig-scheduler mig-api mig-cmd mig-console mig-runner mig-action-generator mig-action-verifier worker-agent-intel \
runner-compliance runner-scribe mig-loader runner-compliance runner-scribe mig-loader