speed up make

Signed-off-by: willieyz <[email protected]>

Author: willieyz

Makefile

@@ -32,17 +32,16 @@ endif
 
 W := $(EXEC_WRAPPER)
 
-# Detect available SHA256 command
-SHA256SUM := $(shell command -v shasum >/dev/null 2>&1 && echo "shasum -a 256" || (command -v sha256sum >/dev/null 2>&1 && echo "sha256sum" || echo ""))
-ifeq ($(SHA256SUM),)
-$(error Neither 'shasum' nor 'sha256sum' found. Please install one of these tools.)
-endif
+BUILD_DIR ?= test/build
 
+# Skip includes for clean target
+ifneq ($(MAKECMDGOALS),clean)
 include test/mk/config.mk
 include test/mk/compiler.mk
 include test/mk/auto.mk
 include test/mk/components.mk
 include test/mk/rules.mk
+endif
 
 quickcheck: test
 
@@ -52,6 +51,12 @@ build: func kat acvp
 test: run_kat run_func run_acvp run_unit
 	$(Q)echo "  Everything checks fine!"
 
+# Detect available SHA256 command
+SHA256SUM := $(shell command -v shasum >/dev/null 2>&1 && echo "shasum -a 256" || (command -v sha256sum >/dev/null 2>&1 && echo "sha256sum" || echo ""))
+ifeq ($(SHA256SUM),)
+$(error Neither 'shasum' nor 'sha256sum' found. Please install one of these tools.)
+endif
+
 run_kat_44: kat_44
 	set -o pipefail; $(W) $(MLDSA44_DIR)/bin/gen_KAT44 | $(SHA256SUM) | cut -d " " -f 1 | xargs ./META.sh ML-DSA-44 kat-sha256
 run_kat_65: kat_65
@@ -230,16 +235,27 @@ else
 	@echo "No specific feature detection available for $(ARCH)"
 endif
 
-clean:
-	-$(RM) -rf *.gcno *.gcda *.lcov *.o *.so
-	-$(RM) -rf $(BUILD_DIR)
-	-make clean -C examples/bring_your_own_fips202 >/dev/null
-	-make clean -C examples/basic >/dev/null
-	-make clean -C examples/monolithic_build >/dev/null
-	-make clean -C examples/monolithic_build_multilevel >/dev/null
-	-make clean -C examples/monolithic_build_native >/dev/null
-	-make clean -C examples/monolithic_build_multilevel_native >/dev/null
-	-make clean -C examples/custom_backend >/dev/null
-	-make clean -C examples/multilevel_build >/dev/null
-	-make clean -C examples/multilevel_build_native >/dev/null
-
+EXAMPLE_DIRS := \
+	examples/bring_your_own_fips202 \
+	examples/bring_your_own_fips202_static \
+	examples/custom_backend \
+	examples/basic \
+	examples/basic_deterministic \
+	examples/monolithic_build \
+	examples/monolithic_build_native \
+	examples/monolithic_build_multilevel \
+	examples/monolithic_build_multilevel_native \
+	examples/multilevel_build \
+	examples/multilevel_build_native
+
+EXAMPLE_CLEAN_TARGETS := $(EXAMPLE_DIRS:%=clean-%)
+
+.PHONY: $(EXAMPLE_CLEAN_TARGETS)
+
+$(EXAMPLE_CLEAN_TARGETS): clean-%:
+	@echo "  CLEAN   $*"
+	-@$(MAKE) clean -C $* >/dev/null
+
+clean: $(EXAMPLE_CLEAN_TARGETS)
+	@echo "  RM      $(BUILD_DIR)"
+	-@$(RM) -rf $(BUILD_DIR)

test/mk/components.mk

@@ -85,15 +85,15 @@ $(MLDSA87_DIR)/bin/%: CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87
 
 # Link tests with respective library (except test_unit which includes sources directly)
 define ADD_SOURCE
-$(BUILD_DIR)/$(1)/bin/$(2)$(shell echo $(1) | tr -d -c 0-9): LDLIBS += -L$(BUILD_DIR) -l$(1)
-$(BUILD_DIR)/$(1)/bin/$(2)$(shell echo $(1) | tr -d -c 0-9): $(BUILD_DIR)/$(1)/test/$(2).c.o $(BUILD_DIR)/lib$(1).a
+$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): LDLIBS += -L$(BUILD_DIR) -l$(1)
+$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/$(2).c.o $(BUILD_DIR)/lib$(1).a
 endef
 
 
 # Special rule for test_unit - link against unit libraries with exposed internal functions
 define ADD_SOURCE_UNIT
-$(BUILD_DIR)/$(1)/bin/test_unit$(shell echo $(1) | tr -d -c 0-9): LDLIBS += -L$(BUILD_DIR) -l$(1)_unit
-$(BUILD_DIR)/$(1)/bin/test_unit$(shell echo $(1) | tr -d -c 0-9): $(BUILD_DIR)/$(1)/test/test_unit.c.o $(BUILD_DIR)/lib$(1)_unit.a $(call MAKE_OBJS, $(BUILD_DIR)/$(1), $(wildcard test/notrandombytes/*.c))
+$(BUILD_DIR)/$(1)/bin/test_unit$(subst mldsa,,$(1)): LDLIBS += -L$(BUILD_DIR) -l$(1)_unit
+$(BUILD_DIR)/$(1)/bin/test_unit$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/test_unit.c.o $(BUILD_DIR)/lib$(1)_unit.a $(call MAKE_OBJS, $(BUILD_DIR)/$(1), $(wildcard test/notrandombytes/*.c))
 endef
 
 

test/mk/config.mk

@@ -92,8 +92,6 @@ $(foreach var,$(RETAINED_VARS),$(eval $(call CAPTURE_VAR,$(var))))
 CYCLES ?=
 OPT ?= 1
 
-BUILD_DIR ?= test/build
-
 MAKE_OBJS = $(2:%=$(1)/%.o)
 OBJS = $(call MAKE_OBJS,$(BUILD_DIR),$(1))