From 6e0da5413303945793bc02a9f69dca5c08b4bdcd Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Thu, 13 Jul 2023 01:28:38 +0200 Subject: [PATCH] ci: Cleanup Makefile --- bazel/Makefile | 7 +++---- cmake/Makefile | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bazel/Makefile b/bazel/Makefile index 432d6f5db60..6a523e60bc0 100644 --- a/bazel/Makefile +++ b/bazel/Makefile @@ -70,7 +70,7 @@ all: build MAKEFLAGS += --no-builtin-rules .SUFFIXES: # Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = +SUFFIXES := # Keep all intermediate files # ToDo: try to remove it later .SECONDARY: @@ -83,17 +83,16 @@ DOCKER_BUILD_CMD := docker build --no-cache else DOCKER_BUILD_CMD := docker build endif - DOCKER_RUN_CMD := docker run --rm --init --net=host # Currently supported distro -DISTROS = alpine archlinux centos debian fedora opensuse ubuntu +DISTROS := alpine archlinux centos debian fedora opensuse ubuntu # $* stem # $< first prerequist # $@ target name -STAGES = env devel build test +STAGES := env devel build test define make-stage-target = #$$(info STAGE: $1) .PHONY: $1 diff --git a/cmake/Makefile b/cmake/Makefile index ceb8a8eb08a..6878911126f 100644 --- a/cmake/Makefile +++ b/cmake/Makefile @@ -129,7 +129,7 @@ all: build MAKEFLAGS += --no-builtin-rules .SUFFIXES: # Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = +SUFFIXES := # Keep all intermediate files # ToDo: try to remove it later .SECONDARY: @@ -147,8 +147,8 @@ endif DOCKER_RUN_CMD := docker run --rm --init --net=host # Currently supported distro -DISTROS = alpine archlinux centos debian fedora opensuse system_deps ubuntu -LANGUAGES = cpp python java dotnet +DISTROS := alpine archlinux centos debian fedora opensuse system_deps ubuntu +LANGUAGES := cpp python java dotnet # $* stem # $< first prerequist @@ -198,7 +198,7 @@ $(foreach stage,$(PRESTAGES),$(eval $(call make-prestage-target,$(stage)))) ############ ## STAGES ## ############ -STAGES = env devel build test install_env install_devel install_build install_test +STAGES := env devel build test install_env install_devel install_build install_test define make-stage-target = #$$(info STAGE: $1) #$$(info Create targets: all_$1 $(addsuffix _$1, $(DISTROS)).) @@ -339,11 +339,11 @@ $(foreach stage,$(STAGES),$(eval $(call make-stage-target,$(stage)))) ############### ## TOOLCHAIN ## ############### -TOOLCHAIN_TARGETS = \ +TOOLCHAIN_TARGETS := \ aarch64 aarch64be \ mips64 mips64el \ ppc64 ppc64le -TOOLCHAIN_STAGES = env devel build test +TOOLCHAIN_STAGES := env devel build test define toolchain-stage-target = #$$(info STAGE: $1) @@ -395,7 +395,7 @@ clean_toolchains: $(addprefix clean_toolchain_, $(TOOLCHAIN_STAGES)) ############# ## VAGRANT ## ############# -VMS = freebsd +VMS := freebsd targets_freebsd = $(addprefix freebsd_, $(LANGUAGES)) .PHONY: freebsd $(targets_freebsd)