From 33de540183dedc31bf74158f96f2c473c58c4b5a Mon Sep 17 00:00:00 2001 From: Chris Bandy Date: Fri, 31 Oct 2014 05:02:58 +0000 Subject: [PATCH] Have only one target that specifies the asset bindata - Development targets recurse with the -debug flag - Assets built as normal dependencies --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index fda6ac4..65cb1ea 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,25 @@ -dev: - rm -f bindata.go - go-bindata -debug -ignore=\\.gitignore -ignore=\\.DS_Store -ignore=\\.gitkeep static/... +BINDATA= + +dev: build-dev-assets go build @echo "You can now execute ./pgweb" -build: - rm -f bindata.go - go-bindata -ignore=\\.gitignore -ignore=\\.DS_Store -ignore=\\.gitkeep static/... +build-assets: + go-bindata $(BINDATA) -ignore=\\.gitignore -ignore=\\.DS_Store -ignore=\\.gitkeep static/... + +build-dev-assets: + @$(MAKE) --no-print-directory build-assets BINDATA="-debug" + +build: build-assets gox -osarch="darwin/amd64 darwin/386 linux/amd64 linux/386 windows/amd64 windows/386" -output="./bin/pgweb_{{.OS}}_{{.Arch}}" setup: go get github.com/mitchellh/gox go get github.com/jteeuwen/go-bindata/... - go-bindata -debug -ignore=\\.gitignore -ignore=\\.DS_Store -ignore=\\.gitkeep static/... + @$(MAKE) --no-print-directory build-dev-assets go get clean: rm -f ./pgweb rm -f ./bin/* - rm -f bindata.go \ No newline at end of file + rm -f bindata.go