beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

MAKE is now a variable in the Makefile (#569)

Browse source 
For building on FreeBSD we need gmake instead of make. As first step making MAKE a variable is an improvement.
This commit is contained in:
Pͥetͣeͫr Zuidˢeͬmͨaͬ 2021-01-14 13:04:42 +01:00 committed by GitHub
parent 1778ee840e
commit fbfd5de096
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -8,7 +8,8 @@ CROWDSEC_FOLDER = "./cmd/crowdsec"
CSCLI_FOLDER = "./cmd/crowdsec-cli/" CSCLI_FOLDER = "./cmd/crowdsec-cli/"
CROWDSEC_BIN = "crowdsec" CROWDSEC_BIN = "crowdsec"
CSCLI_BIN = "cscli" CSCLI_BIN = "cscli"
BUILD_CMD="build" BUILD_CMD = "build"
MAKE = "make"
GOARCH=amd64 GOARCH=amd64
GOOS=linux GOOS=linux
@ -61,8 +62,8 @@ hubci:
@cd ./crowdsec-xxx/tests/ && bash ../../hub-tests/run_tests.sh @cd ./crowdsec-xxx/tests/ && bash ../../hub-tests/run_tests.sh
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 -f $(CROWDSEC_BIN)
@rm -f $(CSCLI_BIN) @rm -f $(CSCLI_BIN)
@rm -f *.log @rm -f *.log
@ -70,7 +71,7 @@ clean:
cscli: cscli:
ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION)) ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION))
@make -C $(CSCLI_FOLDER) build --no-print-directory @$(MAKE) -C $(CSCLI_FOLDER) build --no-print-directory
else else
@echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.." @echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.."
@exit 1; @exit 1;
@ -79,7 +80,7 @@ endif
crowdsec: crowdsec:
ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION)) ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION))
@make -C $(CROWDSEC_FOLDER) build --no-print-directory @$(MAKE) -C $(CROWDSEC_FOLDER) build --no-print-directory
else else
@echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.." @echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.."
@exit 1; @exit 1;
@ -88,7 +89,7 @@ endif
cscli_static: cscli_static:
ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION)) ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION))
@make -C $(CSCLI_FOLDER) static --no-print-directory @$(MAKE) -C $(CSCLI_FOLDER) static --no-print-directory
else else
@echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.." @echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.."
@exit 1; @exit 1;
@ -97,7 +98,7 @@ endif
crowdsec_static: crowdsec_static:
ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION)) ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION))
@make -C $(CROWDSEC_FOLDER) static --no-print-directory @$(MAKE) -C $(CROWDSEC_FOLDER) static --no-print-directory
else else
@echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.." @echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.."
@exit 1; @exit 1;
@ -106,7 +107,7 @@ endif
#.PHONY: test #.PHONY: test
test: test:
ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION)) ifeq ($(lastword $(RESPECT_VERSION)), $(CURRENT_GOVERSION))
@make -C $(CROWDSEC_FOLDER) test --no-print-directory @$(MAKE) -C $(CROWDSEC_FOLDER) test --no-print-directory
else else
@echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.." @echo "Required golang version is $(REQUIRE_GOVERSION). The current one is $(CURRENT_GOVERSION). Exiting.."
@exit 1; @exit 1;