Merge remote-tracking branch 'origin/master' into feature/websockets-plugin

# Conflicts:
#	plugins/http/plugin.go
#	plugins/static/etag.go

1 files changed, 0 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 2d14a101..6ff605ab 100755
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,6 @@
 
 SHELL = /bin/sh
 
-.DEFAULT_GOAL := build
-
-# This will output the help for each task. thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
-help: ## Show this help
-	@printf "\033[33m%s:\033[0m\n" 'Available commands'
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {printf "  \033[32m%-14s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-
-build: ## Build RR binary file for local os/arch
-	CGO_ENABLED=0 go build -trimpath -ldflags "-s" -o ./rr ./cmd/main.go
-
-clean: ## Make some clean
-	rm ./rr
-
-install: build ## Build and install RR locally
-	cp rr /usr/local/bin/rr
-
-uninstall: ## Uninstall locally installed RR
-	rm -f /usr/local/bin/rr
-
 test_coverage:
 	docker-compose -f tests/docker-compose.yaml up -d --remove-orphans
 	rm -rf coverage