Allow any plugin to be enabled or disabled via settings

[micro.git] / Makefile

diff --git a/Makefile b/Makefile
index e4f274e431bc5c320cee0af429a2a04bb804ae3e..c423ac01205f1c16e3bda114c2eab31a780f0760 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,15 @@ ADDITIONAL_GO_LINKER_FLAGS := $(shell GOOS=$(shell go env GOHOSTOS) \
        GOARCH=$(shell go env GOHOSTARCH) \
        go run tools/info-plist.go "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS := -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)' -X main.Debug=OFF
+GOVARS := -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
 
 # Builds micro after checking dependencies but without updating the runtime
-build: update
+build:
        go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
+build-dbg:
+       go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
@@ -23,7 +26,7 @@ build-quick:
        go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
-install: update
+install:
        go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build-all' but installs to $GOBIN afterward
@@ -33,15 +36,16 @@ install-all: runtime install
 install-quick:
        go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)"  ./cmd/micro
 
-update:
-       git pull
-
 # Builds the runtime
 runtime:
-       go get -u github.com/jteeuwen/go-bindata/...
-       $(GOBIN)/go-bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
+       git submodule update --init
+       go build -o tools/bindata ./tools/go-bindata
+       tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
        mv runtime.go internal/config
        gofmt -w internal/config/runtime.go
 
+test:
+       go test ./internal/...
+
 clean:
        rm -f micro