Example: Update to new mlkem-native Makefile for Basic example

The Makefile that the basic example was using was based on a wrongly licensed
Makefile in mlkem-native. mlkem-native has since reworked the Makefiles
using the correct license (Apache-2.0 OR ISC OR MIT).
This commit switches to that Makefile and makes the necessary adjustments
to make it work with mldsa-native.

Signed-off-by: Matthias J. Kannwischer <[email protected]>

Author: mkannwischer

examples/basic/Makefile

@@ -1,32 +1,65 @@
-# (SPDX-License-Identifier: CC-BY-4.0)
+# Copyright (c) The mlkem-native project authors
+# Copyright (c) The mldsa-native project authors
+# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
 
-.PHONY: build run clean size
+.PHONY: build run clean
 .DEFAULT_GOAL := all
 
-# Append cross-prefix for cross compilation
-# Remove or ignore for native builds
 CC  ?= gcc
-SIZE ?= size
+
+# Adjust CFLAGS if needed
+CFLAGS := \
+	-Wall \
+	-Wextra \
+	-Werror=unused-result \
+	-Wpedantic \
+	-Werror \
+	-Wmissing-prototypes \
+	-Wshadow \
+	-Wpointer-arith \
+	-Wredundant-decls \
+	-Wconversion \
+	-Wsign-conversion \
+	-Wno-long-long \
+	-Wno-unknown-pragmas \
+	-Wno-unused-command-line-argument \
+	-O3 \
+	-fomit-frame-pointer \
+	-std=c99 \
+	-pedantic \
+	-MMD \
+	$(CFLAGS)
+
+# If you want to use the native backends, the compiler needs to know about
+# the target architecture. Here, we import the default host detection from
+# mldsa-native's tests, but you can write your own or specialize accordingly.
+AUTO ?= 1
+include auto.mk
+
+# The following only concerns the cross-compilation tests.
+# You can likely ignore the following for your application.
+#
+# Append cross-prefix for cross compilation
 # When called from the root Makefile, CROSS_PREFIX has already been added here
 ifeq (,$(findstring $(CROSS_PREFIX),$(CC)))
 CC  := $(CROSS_PREFIX)$(CC)
 endif
 
-ifeq (,$(findstring $(CROSS_PREFIX),$(SIZE)))
-SIZE  := $(CROSS_PREFIX)$(SIZE)
-endif
-
 # Part A:
 #
 # mldsa-native source and header files
 #
 # If you are not concerned about minimizing for a specific backend,
 # you can just include _all_ source files into your build.
-MLD_SOURCE=$(wildcard                    \
-	../../mldsa/*.c                      \
-	../../mldsa/**/*.c                   \
-	../../mldsa/**/**/*.c                \
-	../../mldsa/**/**/**/*.c)
+#
+# In this example, we compile the individual mldsa-native source files directly.
+# Alternatively, you can compile the 'monobuild' source file mldsa_native.c.
+# See examples/monolithic_build for that.
+MLD_SOURCE=$(wildcard					\
+	mldsa_native/mldsa/*.c				\
+	mldsa_native/mldsa/**/*.c			\
+	mldsa_native/mldsa/**/**/*.c		\
+	mldsa_native/mldsa/**/**/**/*.c)
 
 # Part B:
 #
@@ -50,29 +83,12 @@ ALL_SOURCE=$(MLD_SOURCE) $(RNG_SOURCE) $(APP_SOURCE)
 BUILD_DIR=build
 BIN=test_binary
 
-CFLAGS := \
-	-Wall \
-	-Wextra \
-	-Werror \
-	-Wmissing-prototypes \
-	-Wshadow \
-	-Werror \
-	-Wpointer-arith \
-	-Wredundant-decls \
-	-Wconversion \
-	-Wsign-conversion \
-	-Wno-long-long \
-	-Wno-unknown-pragmas \
-	-Wno-unused-command-line-argument \
-	-fomit-frame-pointer \
-	-std=c99 \
-	-pedantic \
-	-MMD \
-	-O3 \
-	$(CFLAGS)
+#
+# Configuration adjustments
+#
 
-# Use the default namespace prefix from config.h
-# CFLAGS += -DMLD_CONFIG_NAMESPACE_PREFIX=mldsa
+# Pick prefix
+CFLAGS += -DMLD_CONFIG_NAMESPACE_PREFIX=mldsa
 
 BINARY_NAME_FULL_44=$(BUILD_DIR)/$(BIN)44
 BINARY_NAME_FULL_65=$(BUILD_DIR)/$(BIN)65
@@ -88,7 +104,7 @@ $(BINARIES_FULL): $(ALL_SOURCE)
 	mkdir -p $(BUILD_DIR)
 	$(CC) $(CFLAGS) $^ -o $@
 
-all: build size
+all: build
 
 build: $(BINARIES_FULL)
 
@@ -97,13 +113,5 @@ run: $(BINARIES_FULL)
 	$(EXEC_WRAPPER) ./$(BINARY_NAME_FULL_65)
 	$(EXEC_WRAPPER) ./$(BINARY_NAME_FULL_87)
 
-size: build
-	@echo "=== Size info for $(BINARY_NAME_FULL_44) ==="
-	@$(SIZE) $(BINARY_NAME_FULL_44)
-	@echo "=== Size info for $(BINARY_NAME_FULL_65) ==="
-	@$(SIZE) $(BINARY_NAME_FULL_65)
-	@echo "=== Size info for $(BINARY_NAME_FULL_87) ==="
-	@$(SIZE) $(BINARY_NAME_FULL_87)
-
 clean:
 	rm -rf $(BUILD_DIR)

examples/basic/auto.mk

@@ -0,0 +1 @@
+../../test/mk/auto.mk

examples/basic/mldsa_native/mldsa

@@ -0,0 +1 @@
+../../../mldsa