tidy up lbutils makefile

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-04-21 05:47:25 +01:00
parent 7619bfed65
commit 59fefd9c57
+68 -96
View File
@@ -2,34 +2,36 @@
# Copyright (c) 2022,2026 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022,2026 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com> # Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
# Makefile for nvmutil, which is an application
# that modifies Intel GbE NVM configurations.
CC = cc CC = cc
HELLCC = clang
CFLAGS = -Os -Wall -Wextra -std=c99 -pedantic CFLAGS = -Os -Wall -Wextra -std=c99 -pedantic
LDFLAGS = LDFLAGS =
DESTDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR =
INSTALL = install INSTALL = install
# used for portability testing on linux: PROGS = nvmutil mkhtemp lottery
#
PORT_OPENAT = -DUSE_OPENAT=1
PORT_ARC4 = -DUSE_ARC4=1
PORT_URANDOM = -DUSE_URANDOM=1
.SUFFIXES: .c .o OBJDIR = obj
LDIR = # sources
LIB_SRCS = \
lib/state.c \
lib/file.c \
lib/string.c \
lib/usage.c \
lib/command.c \
lib/num.c \
lib/io.c \
lib/checksum.c \
lib/word.c \
lib/mkhtemp.c \
lib/rand.c
HELLFLAGS = $(STRICT) -Weverything NVMUTIL_SRCS = nvmutil.c $(LIB_SRCS)
MKHTEMP_SRCS = mkhtemp.c lib/file.c lib/string.c lib/num.c lib/mkhtemp.c lib/rand.c
PROG = nvmutil LOTTERY_SRCS = lottery.c lib/file.c lib/string.c lib/num.c lib/mkhtemp.c lib/rand.c
PROGMKH = mkhtemp
PROGLOT = lottery
# manually mapped objects (yes, explicit = portable)
OBJS_NVMUTIL = \ OBJS_NVMUTIL = \
obj/nvmutil.o \ obj/nvmutil.o \
obj/lib/state.o \ obj/lib/state.o \
@@ -60,107 +62,77 @@ OBJS_LOTTERY = \
obj/lib/mkhtemp.o \ obj/lib/mkhtemp.o \
obj/lib/rand.o obj/lib/rand.o
# default mode all: $(PROGS)
CC_MODE = $(CC)
all: $(PROG) $(PROGMKH) $(PROGLOT) nvmutil: $(OBJS_NVMUTIL)
$(CC) $(CFLAGS) $(OBJS_NVMUTIL) -o $@ $(LDFLAGS)
$(PROG): $(OBJS_NVMUTIL) mkhtemp: $(OBJS_MKHTEMP)
$(CC_MODE) $(CFLAGS) $(OBJS_NVMUTIL) -o $(PROG) $(LDFLAGS) $(CC) $(CFLAGS) $(OBJS_MKHTEMP) -o $@ $(LDFLAGS)
$(PROGMKH): $(OBJS_MKHTEMP) lottery: $(OBJS_LOTTERY)
$(CC_MODE) $(CFLAGS) $(OBJS_MKHTEMP) -o $(PROGMKH) $(LDFLAGS) $(CC) $(CFLAGS) $(OBJS_LOTTERY) -o $@ $(LDFLAGS)
$(PROGLOT): $(OBJS_LOTTERY)
$(CC_MODE) $(CFLAGS) $(OBJS_LOTTERY) -o $(PROGLOT) $(LDFLAGS)
# ensure obj directory exists
$(OBJS_NVMUTIL): obj
$(OBJS_MKHTEMP): obj
$(OBJS_LOTTERY): obj
# ensure dirs exist
obj: obj:
mkdir obj || true mkdir -p obj/lib
mkdir obj/lib || true
# main program object # compile rules (EXPLICIT = portable)
obj/nvmutil.o: nvmutil.c | obj
$(CC) $(CFLAGS) -c nvmutil.c -o $@
obj/nvmutil.o: nvmutil.c obj/mkhtemp.o: mkhtemp.c | obj
$(CC_MODE) $(CFLAGS) -c nvmutil.c -o obj/nvmutil.o $(CC) $(CFLAGS) -c mkhtemp.c -o $@
obj/mkhtemp.o: mkhtemp.c obj/lottery.o: lottery.c | obj
$(CC_MODE) $(CFLAGS) -c mkhtemp.c -o obj/mkhtemp.o $(CC) $(CFLAGS) -c lottery.c -o $@
obj/lottery.o: lottery.c obj/lib/state.o: lib/state.c | obj
$(CC_MODE) $(CFLAGS) -c lottery.c -o obj/lottery.o $(CC) $(CFLAGS) -c lib/state.c -o $@
# library/helper objects obj/lib/file.o: lib/file.c | obj
$(CC) $(CFLAGS) -c lib/file.c -o $@
obj/lib/state.o: lib/state.c obj/lib/string.o: lib/string.c | obj
$(CC_MODE) $(CFLAGS) -c lib/state.c -o obj/lib/state.o $(CC) $(CFLAGS) -c lib/string.c -o $@
obj/lib/file.o: lib/file.c obj/lib/usage.o: lib/usage.c | obj
$(CC_MODE) $(CFLAGS) -c lib/file.c -o obj/lib/file.o $(CC) $(CFLAGS) -c lib/usage.c -o $@
obj/lib/string.o: lib/string.c obj/lib/command.o: lib/command.c | obj
$(CC_MODE) $(CFLAGS) -c lib/string.c -o obj/lib/string.o $(CC) $(CFLAGS) -c lib/command.c -o $@
obj/lib/usage.o: lib/usage.c obj/lib/num.o: lib/num.c | obj
$(CC_MODE) $(CFLAGS) -c lib/usage.c -o obj/lib/usage.o $(CC) $(CFLAGS) -c lib/num.c -o $@
obj/lib/command.o: lib/command.c obj/lib/io.o: lib/io.c | obj
$(CC_MODE) $(CFLAGS) -c lib/command.c -o obj/lib/command.o $(CC) $(CFLAGS) -c lib/io.c -o $@
obj/lib/num.o: lib/num.c obj/lib/checksum.o: lib/checksum.c | obj
$(CC_MODE) $(CFLAGS) -c lib/num.c -o obj/lib/num.o $(CC) $(CFLAGS) -c lib/checksum.c -o $@
obj/lib/io.o: lib/io.c obj/lib/word.o: lib/word.c | obj
$(CC_MODE) $(CFLAGS) -c lib/io.c -o obj/lib/io.o $(CC) $(CFLAGS) -c lib/word.c -o $@
obj/lib/checksum.o: lib/checksum.c obj/lib/mkhtemp.o: lib/mkhtemp.c | obj
$(CC_MODE) $(CFLAGS) -c lib/checksum.c -o obj/lib/checksum.o $(CC) $(CFLAGS) -c lib/mkhtemp.c -o $@
obj/lib/word.o: lib/word.c obj/lib/rand.o: lib/rand.c | obj
$(CC_MODE) $(CFLAGS) -c lib/word.c -o obj/lib/word.o $(CC) $(CFLAGS) -c lib/rand.c -o $@
obj/lib/mkhtemp.o: lib/mkhtemp.c install: $(PROGS)
$(CC_MODE) $(CFLAGS) -c lib/mkhtemp.c -o obj/lib/mkhtemp.o mkdir -p $(DESTDIR)$(PREFIX)/bin
for p in $(PROGS); do \
obj/lib/rand.o: lib/rand.c $(INSTALL) $$p $(DESTDIR)$(PREFIX)/bin/$$p; \
$(CC_MODE) $(CFLAGS) -c lib/rand.c -o obj/lib/rand.o chmod 755 $(DESTDIR)$(PREFIX)/bin/$$p; \
done
# install
install: $(PROG) $(PROGMKH) $(PROGLOT)
$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
$(INSTALL) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
chmod 755 $(DESTDIR)$(PREFIX)/bin/$(PROG)
$(INSTALL) $(PROGMKH) $(DESTDIR)$(PREFIX)/bin/$(PROGMKH)
chmod 755 $(DESTDIR)$(PREFIX)/bin/$(PROGMKH)
$(INSTALL) $(PROGLOT) $(DESTDIR)$(PREFIX)/bin/$(PROGLOT)
chmod 755 $(DESTDIR)$(PREFIX)/bin/$(PROGLOT)
uninstall: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG) for p in $(PROGS); do \
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGMKH) rm -f $(DESTDIR)$(PREFIX)/bin/$$p; \
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGLOT) done
clean: clean:
rm -f $(PROG) $(PROGMKH) $(OBJS_NVMUTIL) $(OBJS_MKHTEMP) \ rm -rf $(OBJDIR) $(PROGS)
$(OBJS_LOTTERY) $(PROGLOT)
distclean: clean distclean: clean
# mode targets (portable replacement for ifeq)
strict:
$(MAKE) CFLAGS="$(CFLAGS) $(HELLFLAGS)" CC_MODE="$(HELLCC)"
# BSD-like portability test (openat + arc4random)
portable-bsd:
$(MAKE) CFLAGS="$(CFLAGS) $(PORT_OPENAT) $(PORT_ARC4)" CC_MODE="$(CC)"
# fallback portability test (openat + urandom -- old linux mostly)
portable-urandom:
$(MAKE) CFLAGS="$(CFLAGS) $(PORT_OPENAT) $(PORT_URANDOM)" \
CC_MODE="$(CC)"