Docker: Makefile housekeeping.

This commit is contained in:
Konstantin Pavlov
2023-05-05 17:20:06 -07:00
parent 6e548cbb30
commit 5b98d87e52

View File

@@ -8,8 +8,6 @@ DEFAULT_VERSION := $(NXT_VERSION)
VERSION ?= $(DEFAULT_VERSION) VERSION ?= $(DEFAULT_VERSION)
PATCHLEVEL ?= 1 PATCHLEVEL ?= 1
EXPORT_DIR := $(VERSION)
MODULES ?= go jsc node perl php python ruby MODULES ?= go jsc node perl php python ruby
VARIANT ?= bullseye VARIANT ?= bullseye
@@ -70,7 +68,7 @@ INSTALL_ruby ?= ruby-install
RUN_ruby ?= gem install rack RUN_ruby ?= gem install rack
default: default:
@echo "valid targets: all build dockerfiles clean" @echo "valid targets: all build dockerfiles library clean"
MODVERSIONS = $(foreach module, $(MODULES), $(foreach modversion, $(shell for v in $(VERSIONS_$(module)); do echo $$v; done | sort -r), $(module)$(modversion))) minimal MODVERSIONS = $(foreach module, $(MODULES), $(foreach modversion, $(shell for v in $(VERSIONS_$(module)); do echo $$v; done | sort -r), $(module)$(modversion))) minimal
@@ -121,7 +119,6 @@ library:
all: $(addprefix Dockerfile., $(MODVERSIONS)) all: $(addprefix Dockerfile., $(MODVERSIONS))
clean: clean:
rm -f $(addprefix Dockerfile., $(MODVERSIONS)) rm -f Dockerfile.*
rm -rf $(EXPORT_DIR)
.PHONY: default build dockerfiles clean library .PHONY: default build dockerfiles clean library