From 6e4583ef1d72e5a303aa7ac9b7d8358deb6f2d74 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 1 Dec 2014 14:45:50 -0800 Subject: [PATCH] Build restructure top level --- Makefile | 16 +++++++++------- pkgs/erasure/Makefile | 14 +++++++++++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2502e4db2..ead81b321 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,12 @@ getdeps: @go get code.google.com/p/go.tools/cmd/cover && echo "Installing cover" build-erasure: - @cd pkgs/erasure && ${MAKE} ${MAKE_OPTIONS} + @$(MAKE) $(MAKE_OPTIONS) -C pkgs/erasure/isal lib + @godep go test -race github.com/minio-io/minio/pkgs/erasure + @godep go test -coverprofile=cover.out github.com/minio-io/minio/pkgs/erasure build-signify: - @cd pkgs/signify && ${MAKE} ${MAKE_OPTIONS} + @$(MAKE) $(MAKE_OPTIONS) -C pkgs/signify build-split: build-strbyteconv @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/split @@ -27,13 +29,13 @@ install: build-erasure @godep go install github.com/minio-io/minio/cmd/erasure-demo && echo "Installed erasure-demo into ${GOPATH}/bin" save: - godep save ./... + @godep save ./... restore: - godep restore + @godep restore env: - godep go env + @godep go env -run: all - minio gateway +clean: + @rm -v cover.out diff --git a/pkgs/erasure/Makefile b/pkgs/erasure/Makefile index 405df1ac4..f146d7664 100644 --- a/pkgs/erasure/Makefile +++ b/pkgs/erasure/Makefile @@ -1,11 +1,19 @@ all: build test .PHONY: all -test: - @godep go test +test: test-race test-cover + +test-race: + @godep go test -race + +test-cover: + @godep go test -coverprofile=cover.out isal/isal-l.a: - @$(MAKE) --quiet -C isal lib + @$(MAKE) -C isal lib build: isal/isal-l.a @godep go build + +clean: + @rm -v cover.out