From 383eebf2b6009d0c1963b4c5be9770a16807c305 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Tue, 1 Feb 2022 09:22:47 +0100
Subject: [PATCH] Makefile cleanup (#1211)

* rm -f => $(RM)
* PHONY targets
* remove email plugin binary on cleanup
* unused make variables
---
 Makefile                              | 33 ++++++++++++++-------------
 cmd/crowdsec-cli/Makefile             |  8 ++++---
 cmd/crowdsec/Makefile                 |  9 ++++----
 plugins/notifications/email/Makefile  |  4 ++--
 plugins/notifications/http/Makefile   |  4 ++--
 plugins/notifications/slack/Makefile  |  5 ++--
 plugins/notifications/splunk/Makefile |  5 ++--
 7 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 51b1513a3..7893b9e51 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,6 @@ else
 	include $(ROOT)/platform/linux.mk
 endif
 
-PREFIX?="/tmp/crowdsec/"
-CFG_PREFIX = $(PREFIX)"/etc/crowdsec/"
-BIN_PREFIX = $(PREFIX)"/usr/local/bin/"
-DATA_PREFIX = $(PREFIX)"/var/run/crowdsec/"
-
-PID_DIR = $(PREFIX)"/var/run/"
 CROWDSEC_FOLDER = "./cmd/crowdsec"
 CSCLI_FOLDER = "./cmd/crowdsec-cli/"
 
@@ -67,12 +61,16 @@ export LD_OPTS_STATIC=-ldflags "-s -w -X github.com/crowdsecurity/crowdsec/pkg/c
 
 RELDIR = crowdsec-$(BUILD_VERSION)
 
+.PHONY: all
 all: clean test build
 
+.PHONY: build
 build: goversion crowdsec cscli plugins
 
+.PHONY: static
 static: crowdsec_static cscli_static plugins_static
 
+.PHONY: plugins
 plugins: http-plugin slack-plugin splunk-plugin email-plugin
 
 plugins_static: http-plugin_static slack-plugin_static splunk-plugin_static email-plugin_static
@@ -88,16 +86,18 @@ goversion:
         exit 1; \
     fi
 
+.PHONY: clean
 clean:
 	@$(MAKE) -C $(CROWDSEC_FOLDER) clean --no-print-directory
 	@$(MAKE) -C $(CSCLI_FOLDER) clean --no-print-directory
-	@rm -f $(CROWDSEC_BIN)
-	@rm -f $(CSCLI_BIN)
-	@rm -f *.log
-	@rm -f crowdsec-release.tgz
-	@rm -f $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN)
-	@rm -f $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN)
-	@rm -f $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN)
+	@$(RM) $(CROWDSEC_BIN)
+	@$(RM) $(CSCLI_BIN)
+	@$(RM) *.log
+	@$(RM) crowdsec-release.tgz
+	@$(RM) $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN)
+	@$(RM) $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN)
+	@$(RM) $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN)
+	@$(RM) $(EMAIL_PLUGIN_FOLDER)/$(EMAIL_PLUGIN_BIN)
 
 cscli: goversion
 	@GOARCH=$(GOARCH) GOOS=$(GOOS) $(MAKE) -C $(CSCLI_FOLDER) build --no-print-directory
@@ -138,6 +138,7 @@ email-plugin_static:goversion
 test: goversion
 	@$(MAKE) -C $(CROWDSEC_FOLDER) test --no-print-directory
 
+.PHONY: package
 package:
 	@echo Building Release to dir $(RELDIR)
 	@mkdir -p $(RELDIR)/cmd/crowdsec
@@ -196,8 +197,8 @@ package_static:
 check_release:
 	@if [ -d $(RELDIR) ]; then echo "$(RELDIR) already exists, abort" ;  exit 1 ; fi
 
-.PHONY:
+.PHONY: release
 release: check_release build package
 
-.PHONY:
-release_static: check_release static package_static
\ No newline at end of file
+.PHONY: release_static
+release_static: check_release static package_static
diff --git a/cmd/crowdsec-cli/Makefile b/cmd/crowdsec-cli/Makefile
index 6ec33b99a..b5e639819 100644
--- a/cmd/crowdsec-cli/Makefile
+++ b/cmd/crowdsec-cli/Makefile
@@ -8,6 +8,7 @@ BINARY_NAME=cscli
 PREFIX?="/"
 BIN_PREFIX = $(PREFIX)"/usr/local/bin/"
 
+.PHONY: all
 all: clean build
 
 build: clean
@@ -16,6 +17,7 @@ build: clean
 static: clean
 	@$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
 
+.PHONY: install
 install: install-conf install-bin
 
 install-conf:
@@ -24,8 +26,8 @@ install-bin:
 	@install -v -m 755 -D "$(BINARY_NAME)" "$(BIN_PREFIX)/$(BINARY_NAME)" || exit
 
 uninstall:
-	@rm -rf $(CSCLI_CONFIG)
-	@rm -rf $(BIN_PREFIX)$(BINARY_NAME)
+	@$(RM) -r $(CSCLI_CONFIG)
+	@$(RM) -r $(BIN_PREFIX)$(BINARY_NAME)
 
 clean:
-	@rm -f $(BINARY_NAME)
+	@$(RM) $(BINARY_NAME)
diff --git a/cmd/crowdsec/Makefile b/cmd/crowdsec/Makefile
index 6e636c1cc..07bb2bc9c 100644
--- a/cmd/crowdsec/Makefile
+++ b/cmd/crowdsec/Makefile
@@ -14,6 +14,7 @@ PID_DIR = $(PREFIX)"/var/run/"
 
 SYSTEMD_PATH_FILE="/etc/systemd/system/crowdsec.service"
 
+.PHONY: all
 all: clean test build
 
 build: clean
@@ -61,7 +62,7 @@ systemd: install
 
 .PHONY: uninstall
 uninstall:
-	rm -rf $(CFG_PREFIX)
-	rm -rf $(DATA_PREFIX)
-	rm -f "$(BIN_PREFIX)/$(CROWDSEC_BIN)"
-	rm -f "$(SYSTEMD_PATH_FILE)"
+	$(RM) -r "$(CFG_PREFIX)"
+	$(RM) -r "$(DATA_PREFIX)"
+	$(RM) "$(BIN_PREFIX)/$(CROWDSEC_BIN)"
+	$(RM) "$(SYSTEMD_PATH_FILE)"
diff --git a/plugins/notifications/email/Makefile b/plugins/notifications/email/Makefile
index b304a88ad..697bea1f2 100644
--- a/plugins/notifications/email/Makefile
+++ b/plugins/notifications/email/Makefile
@@ -7,10 +7,10 @@ GOGET=$(GOCMD) get
 BINARY_NAME=notification-email
 
 clean:
-	@rm -f $(BINARY_NAME)
+	@$(RM) "$(BINARY_NAME)"
 
 build: clean
 	@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
 
 static: clean
-	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
\ No newline at end of file
+	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
diff --git a/plugins/notifications/http/Makefile b/plugins/notifications/http/Makefile
index f59c61ad7..ce1d8626a 100644
--- a/plugins/notifications/http/Makefile
+++ b/plugins/notifications/http/Makefile
@@ -7,10 +7,10 @@ GOGET=$(GOCMD) get
 BINARY_NAME=notification-http
 
 clean:
-	@rm -f $(BINARY_NAME)
+	@$(RM) "$(BINARY_NAME)"
 
 build: clean
 	@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
 
 static: clean
-	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
\ No newline at end of file
+	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
diff --git a/plugins/notifications/slack/Makefile b/plugins/notifications/slack/Makefile
index 22c4064ea..e07fdd32a 100644
--- a/plugins/notifications/slack/Makefile
+++ b/plugins/notifications/slack/Makefile
@@ -1,4 +1,3 @@
-
 # Go parameters
 GOCMD=go
 GOBUILD=$(GOCMD) build
@@ -11,8 +10,8 @@ build: clean
 	@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
 
 clean:
-	@rm -f $(BINARY_NAME)
+	@$(RM) "$(BINARY_NAME)"
 
 
 static: clean
-	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
\ No newline at end of file
+	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
diff --git a/plugins/notifications/splunk/Makefile b/plugins/notifications/splunk/Makefile
index ca61ab620..ae3c65cb9 100644
--- a/plugins/notifications/splunk/Makefile
+++ b/plugins/notifications/splunk/Makefile
@@ -1,4 +1,3 @@
-
 # Go parameters
 GOCMD=go
 GOBUILD=$(GOCMD) build
@@ -11,7 +10,7 @@ build: clean
 	@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
 
 clean:
-	@rm -f $(BINARY_NAME)
+	@$(RM) "$(BINARY_NAME)"
 
 static: clean
-	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
\ No newline at end of file
+	$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo