Browse Source

Remove PKG variable from Makefile.am, as it's redundant with EXENAME.

Also simplify binary targets and allow additional flags to be passed
to `go build` and `go test`.
pull/117/head
Lance Cooper 11 years ago
parent
commit
84ed21513d
  1. 23
      Makefile.am

23
Makefile.am

@ -21,10 +21,11 @@
AUTOMAKE_OPTIONS = -Wno-portability AUTOMAKE_OPTIONS = -Wno-portability
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
PKG := app/spreed-webrtc-server
EXENAME := spreed-webrtc-server EXENAME := spreed-webrtc-server
CONFIG_FILE ?= spreed-webrtc-server.conf CONFIG_FILE ?= spreed-webrtc-server.conf
CONFIG_PATH ?= /etc CONFIG_PATH ?= /etc
GOBUILDFLAGS ?=
GOTESTFLAGS ?=
VENDOR = "$(CURDIR)/vendor" VENDOR = "$(CURDIR)/vendor"
GOPATH = "$(VENDOR):$(CURDIR)" GOPATH = "$(VENDOR):$(CURDIR)"
@ -52,28 +53,26 @@ gopath:
@echo GOPATH=$(GOPATH) @echo GOPATH=$(GOPATH)
get: get:
GOPATH=$(GOPATH) $(GO) get $(PKG) GOPATH=$(GOPATH) $(GO) get app/...
getupdate: getupdate:
rm -rf vendor/* rm -rf vendor/*
GOPATH=$(GOPATH) $(GO) get $(PKG) GOPATH=$(GOPATH) $(GO) get app/...
binary: binary:
GOPATH=$(GOPATH) $(GO) build -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' $(PKG) GOPATH=$(GOPATH) $(GO) build $(GOBUILDFLAGS) -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
binaryrace: binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race
GOPATH=$(GOPATH) $(GO) build -race -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' $(PKG) binaryrace: binary
binaryall: binaryall: GOBUILDFLAGS := $(GOBUILDFLAGS) -a
GOPATH=$(GOPATH) $(GO) build -a -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' $(PKG) binaryall: binary
fmt: fmt:
GOPATH=$(GOPATH) $(GO) fmt app/... GOPATH=$(GOPATH) $(GO) fmt app/...
test: TESTDEPS = $(shell GOPATH=$(GOPATH) $(GO) list -f '{{.ImportPath}}{{"\n"}}{{join .Deps "\n"}}' $(PKG) | $(GREP) $(PKG))
test: get test: get
GOPATH=$(GOPATH) $(GO) test -i $(TESTDEPS) GOPATH=$(GOPATH) $(GO) test $(GOTESTFLAGS) app/...
GOPATH=$(GOPATH) $(GO) test -v $(TESTDEPS)
assets: javascript fonts assets: javascript fonts
@ -147,7 +146,7 @@ install:
$(INSTALL) -D static/js/libs/webodf.js $(SHARE)/www/static/js/libs/webodf.js $(INSTALL) -D static/js/libs/webodf.js $(SHARE)/www/static/js/libs/webodf.js
clean: clean:
GOPATH=$(GOPATH) $(GO) clean -i $(PKG) GOPATH=$(GOPATH) $(GO) clean -i app/...
rm -rf $(CURDIR)/pkg rm -rf $(CURDIR)/pkg
rm -rf $(CURDIR)/static/fonts rm -rf $(CURDIR)/static/fonts
rm -rf $(CURDIR)/build/out rm -rf $(CURDIR)/build/out

Loading…
Cancel
Save