Makefile cleanup (#1211)
* rm -f => $(RM) * PHONY targets * remove email plugin binary on cleanup * unused make variables
This commit is contained in:
parent
5f2d7f6a65
commit
383eebf2b6
31
Makefile
31
Makefile
|
@ -7,12 +7,6 @@ else
|
||||||
include $(ROOT)/platform/linux.mk
|
include $(ROOT)/platform/linux.mk
|
||||||
endif
|
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"
|
CROWDSEC_FOLDER = "./cmd/crowdsec"
|
||||||
CSCLI_FOLDER = "./cmd/crowdsec-cli/"
|
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)
|
RELDIR = crowdsec-$(BUILD_VERSION)
|
||||||
|
|
||||||
|
.PHONY: all
|
||||||
all: clean test build
|
all: clean test build
|
||||||
|
|
||||||
|
.PHONY: build
|
||||||
build: goversion crowdsec cscli plugins
|
build: goversion crowdsec cscli plugins
|
||||||
|
|
||||||
|
.PHONY: static
|
||||||
static: crowdsec_static cscli_static plugins_static
|
static: crowdsec_static cscli_static plugins_static
|
||||||
|
|
||||||
|
.PHONY: plugins
|
||||||
plugins: http-plugin slack-plugin splunk-plugin email-plugin
|
plugins: http-plugin slack-plugin splunk-plugin email-plugin
|
||||||
|
|
||||||
plugins_static: http-plugin_static slack-plugin_static splunk-plugin_static email-plugin_static
|
plugins_static: http-plugin_static slack-plugin_static splunk-plugin_static email-plugin_static
|
||||||
|
@ -88,16 +86,18 @@ goversion:
|
||||||
exit 1; \
|
exit 1; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
@$(MAKE) -C $(CROWDSEC_FOLDER) clean --no-print-directory
|
@$(MAKE) -C $(CROWDSEC_FOLDER) clean --no-print-directory
|
||||||
@$(MAKE) -C $(CSCLI_FOLDER) clean --no-print-directory
|
@$(MAKE) -C $(CSCLI_FOLDER) clean --no-print-directory
|
||||||
@rm -f $(CROWDSEC_BIN)
|
@$(RM) $(CROWDSEC_BIN)
|
||||||
@rm -f $(CSCLI_BIN)
|
@$(RM) $(CSCLI_BIN)
|
||||||
@rm -f *.log
|
@$(RM) *.log
|
||||||
@rm -f crowdsec-release.tgz
|
@$(RM) crowdsec-release.tgz
|
||||||
@rm -f $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN)
|
@$(RM) $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN)
|
||||||
@rm -f $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN)
|
@$(RM) $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN)
|
||||||
@rm -f $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN)
|
@$(RM) $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN)
|
||||||
|
@$(RM) $(EMAIL_PLUGIN_FOLDER)/$(EMAIL_PLUGIN_BIN)
|
||||||
|
|
||||||
cscli: goversion
|
cscli: goversion
|
||||||
@GOARCH=$(GOARCH) GOOS=$(GOOS) $(MAKE) -C $(CSCLI_FOLDER) build --no-print-directory
|
@GOARCH=$(GOARCH) GOOS=$(GOOS) $(MAKE) -C $(CSCLI_FOLDER) build --no-print-directory
|
||||||
|
@ -138,6 +138,7 @@ email-plugin_static:goversion
|
||||||
test: goversion
|
test: goversion
|
||||||
@$(MAKE) -C $(CROWDSEC_FOLDER) test --no-print-directory
|
@$(MAKE) -C $(CROWDSEC_FOLDER) test --no-print-directory
|
||||||
|
|
||||||
|
.PHONY: package
|
||||||
package:
|
package:
|
||||||
@echo Building Release to dir $(RELDIR)
|
@echo Building Release to dir $(RELDIR)
|
||||||
@mkdir -p $(RELDIR)/cmd/crowdsec
|
@mkdir -p $(RELDIR)/cmd/crowdsec
|
||||||
|
@ -196,8 +197,8 @@ package_static:
|
||||||
check_release:
|
check_release:
|
||||||
@if [ -d $(RELDIR) ]; then echo "$(RELDIR) already exists, abort" ; exit 1 ; fi
|
@if [ -d $(RELDIR) ]; then echo "$(RELDIR) already exists, abort" ; exit 1 ; fi
|
||||||
|
|
||||||
.PHONY:
|
.PHONY: release
|
||||||
release: check_release build package
|
release: check_release build package
|
||||||
|
|
||||||
.PHONY:
|
.PHONY: release_static
|
||||||
release_static: check_release static package_static
|
release_static: check_release static package_static
|
|
@ -8,6 +8,7 @@ BINARY_NAME=cscli
|
||||||
PREFIX?="/"
|
PREFIX?="/"
|
||||||
BIN_PREFIX = $(PREFIX)"/usr/local/bin/"
|
BIN_PREFIX = $(PREFIX)"/usr/local/bin/"
|
||||||
|
|
||||||
|
.PHONY: all
|
||||||
all: clean build
|
all: clean build
|
||||||
|
|
||||||
build: clean
|
build: clean
|
||||||
|
@ -16,6 +17,7 @@ build: clean
|
||||||
static: clean
|
static: clean
|
||||||
@$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
|
@$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
|
||||||
|
|
||||||
|
.PHONY: install
|
||||||
install: install-conf install-bin
|
install: install-conf install-bin
|
||||||
|
|
||||||
install-conf:
|
install-conf:
|
||||||
|
@ -24,8 +26,8 @@ install-bin:
|
||||||
@install -v -m 755 -D "$(BINARY_NAME)" "$(BIN_PREFIX)/$(BINARY_NAME)" || exit
|
@install -v -m 755 -D "$(BINARY_NAME)" "$(BIN_PREFIX)/$(BINARY_NAME)" || exit
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@rm -rf $(CSCLI_CONFIG)
|
@$(RM) -r $(CSCLI_CONFIG)
|
||||||
@rm -rf $(BIN_PREFIX)$(BINARY_NAME)
|
@$(RM) -r $(BIN_PREFIX)$(BINARY_NAME)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(BINARY_NAME)
|
@$(RM) $(BINARY_NAME)
|
||||||
|
|
|
@ -14,6 +14,7 @@ PID_DIR = $(PREFIX)"/var/run/"
|
||||||
|
|
||||||
SYSTEMD_PATH_FILE="/etc/systemd/system/crowdsec.service"
|
SYSTEMD_PATH_FILE="/etc/systemd/system/crowdsec.service"
|
||||||
|
|
||||||
|
.PHONY: all
|
||||||
all: clean test build
|
all: clean test build
|
||||||
|
|
||||||
build: clean
|
build: clean
|
||||||
|
@ -61,7 +62,7 @@ systemd: install
|
||||||
|
|
||||||
.PHONY: uninstall
|
.PHONY: uninstall
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -rf $(CFG_PREFIX)
|
$(RM) -r "$(CFG_PREFIX)"
|
||||||
rm -rf $(DATA_PREFIX)
|
$(RM) -r "$(DATA_PREFIX)"
|
||||||
rm -f "$(BIN_PREFIX)/$(CROWDSEC_BIN)"
|
$(RM) "$(BIN_PREFIX)/$(CROWDSEC_BIN)"
|
||||||
rm -f "$(SYSTEMD_PATH_FILE)"
|
$(RM) "$(SYSTEMD_PATH_FILE)"
|
||||||
|
|
|
@ -7,7 +7,7 @@ GOGET=$(GOCMD) get
|
||||||
BINARY_NAME=notification-email
|
BINARY_NAME=notification-email
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(BINARY_NAME)
|
@$(RM) "$(BINARY_NAME)"
|
||||||
|
|
||||||
build: clean
|
build: clean
|
||||||
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
||||||
|
|
|
@ -7,7 +7,7 @@ GOGET=$(GOCMD) get
|
||||||
BINARY_NAME=notification-http
|
BINARY_NAME=notification-http
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(BINARY_NAME)
|
@$(RM) "$(BINARY_NAME)"
|
||||||
|
|
||||||
build: clean
|
build: clean
|
||||||
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# Go parameters
|
# Go parameters
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
GOBUILD=$(GOCMD) build
|
GOBUILD=$(GOCMD) build
|
||||||
|
@ -11,7 +10,7 @@ build: clean
|
||||||
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(BINARY_NAME)
|
@$(RM) "$(BINARY_NAME)"
|
||||||
|
|
||||||
|
|
||||||
static: clean
|
static: clean
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# Go parameters
|
# Go parameters
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
GOBUILD=$(GOCMD) build
|
GOBUILD=$(GOCMD) build
|
||||||
|
@ -11,7 +10,7 @@ build: clean
|
||||||
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
@$(GOBUILD) $(LD_OPTS) -o $(BINARY_NAME) -v
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(BINARY_NAME)
|
@$(RM) "$(BINARY_NAME)"
|
||||||
|
|
||||||
static: clean
|
static: clean
|
||||||
$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
|
$(GOBUILD) $(LD_OPTS_STATIC) -o $(BINARY_NAME) -v -a -tags netgo
|
Loading…
Reference in a new issue