From 1ad02e863914c9975335a14e714bbdcf8ab071c5 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sat, 24 Sep 2016 22:47:30 +0100 Subject: [PATCH] Makefile: remove generate (#294) Fixes #293 --- Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index e57ead43f..4a388a05d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ all: coredns # Phony this to ensure we always build the binary. # TODO: Add .go file dependencies. .PHONY: coredns -coredns: generate deps +coredns: deps go build $(BUILD_VERBOSE) -ldflags="-s -w" .PHONY: docker @@ -19,18 +19,8 @@ docker: deps CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" docker build -t $(DOCKER_IMAGE_NAME) . -../../mholt/caddy: - # Get caddy so we can generate into that codebase - # before getting all other dependencies. - go get ${BUILD_VERBOSE} github.com/mholt/caddy - -.PHONY: generate -generate: ../../mholt/caddy - go get $(BUILD_VERBOSE) golang.org/x/tools/go/ast/astutil - go generate $(BUILD_VERBOSE) - .PHONY: deps -deps: generate +deps: go get ${BUILD_VERBOSE} .PHONY: test