Skip to content

Commit

Permalink
ci: Cleanup Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Jul 12, 2023
1 parent 3a2510f commit 6e0da54
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
7 changes: 3 additions & 4 deletions bazel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions cmake/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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)).)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 6e0da54

Please sign in to comment.