From 63f0fe9702b293715d5f51e59931782bb278b67b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 17 Mar 2026 19:35:50 +0000
Subject: nvmutil: tidy up the makefile

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 util/nvmutil/Makefile | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'util')

diff --git a/util/nvmutil/Makefile b/util/nvmutil/Makefile
index 5e705d3c..f3f8d4c7 100644
--- a/util/nvmutil/Makefile
+++ b/util/nvmutil/Makefile
@@ -3,24 +3,19 @@
 # Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
 
 CC?=cc
-CSTD?=-std=c90
-WERROR?=-Werror
-CWARN?=-Wall -Wextra -pedantic
-COPT?=-Os
 CFLAGS?=
 LDFLAGS?=
 DESTDIR?=
 PREFIX?=/usr/local
 INSTALL?=install
-LDIR?=-I.
 
-OPTS?=$(LDIR) $(CFLAGS) $(LDFLAGS)
+# maybe add -I. here when running make
+# e.g. make LDIR=-I.
+LDIR?=
 
-STRICTWARN?=$(OPTS) $(CWARN) $(CSTD) $(COPT)
-
-STRICT?=$(STRICTWARN) $(WERROR)
-
-# clang static analyser
+PORTABLE?=$(LDIR) $(CFLAGS)
+WARN?=$(PORTABLE) -Wall -Wextra
+STRICT?=$(WARN) -std=c90 -pedantic -Werror
 HELLFLAGS?=$(STRICT) -Weverything
 
 # program name
@@ -29,17 +24,17 @@ PROG=nvmutil
 all: $(PROG)
 
 $(PROG): $(PROG).c
-	$(CC) $(OPTS) $(PROG).c -o $(PROG)
+	$(CC) $(PORTABLE) $(PROG).c -o $(PROG) $(LDFLAGS)
 
-strictwarn: $(PROG).c
-	$(CC) $(STRICTWARN) $(PROG).c -o $(PROG)
+warn: $(PROG).c
+	$(CC) $(WARN) $(PROG).c -o $(PROG) $(LDFLAGS)
 
 strict: $(PROG).c
-	$(CC) $(STRICT) $(PROG).c -o $(PROG)
+	$(CC) $(STRICT) $(PROG).c -o $(PROG) $(LDFLAGS)
 
-#clang static analyser
+# clang strictness
 hell: $(PROG).c
-	$(CC) $(HELLFLAGS) $(PROG).c -o $(PROG)
+	$(CC) $(HELLFLAGS) $(PROG).c -o $(PROG) $(LDFLAGS)
 
 install: $(PROG)
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
@@ -54,4 +49,4 @@ clean:
 
 distclean: clean
 
-.PHONY: all strictwarn strict hell install uninstall clean distclean
+.PHONY: all warn strict hell install uninstall clean distclean
-- 
cgit v1.2.1