From 6270bead9be7374c2196f699d57c76c051e17207 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Fri, 25 Jan 2019 08:46:51 -0800 Subject: Remove duplicate plugins make action The action which compiles all the plugins is duplicated in the Makefile. This change remove that duplication to define a consistent build process. Change-Id: I0efecdcb70052b4c0d66102c56e0c715481cb34a Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-301 --- src/k8splugin/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/k8splugin/Makefile b/src/k8splugin/Makefile index 751cd5f4..635c9155 100644 --- a/src/k8splugin/Makefile +++ b/src/k8splugin/Makefile @@ -15,9 +15,8 @@ export GO111MODULE=on .PHONY: plugins -all: clean +all: clean plugins CGO_ENABLED=1 GOOS=linux GOARCH=amd64 - @find plugins -type d -not -path plugins -exec sh -c "ls {}/plugin.go | xargs go build -buildmode=plugin -a -tags netgo -o $(basename {}).so" \; @go build -a -tags netgo -o ./k8plugin ./cmd/main.go # The following is done this way as each patch on CI runs build and each merge runs deploy. So for build we don't need to build binary and hence @@ -47,7 +46,7 @@ plugins: @find plugins -maxdepth 1 -type d -not -path plugins -exec sh -c "ls {}/plugin.go | xargs go build -buildmode=plugin -o $(basename {}).so" \; clean: - find . -name "*so" -delete + @find . -name "*so" -delete @rm -f k8plugin .PHONY: cover -- cgit 1.2.3-korg