From de879851a4e68bad9cfcefc8aaa39eabfbc7f1df Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 29 Apr 2022 16:45:23 -0400 Subject: make: don't treat cert.S specially Signed-off-by: Peter Jones --- Make.rules | 3 +++ Makefile | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Make.rules b/Make.rules index 532aab66..7c6ec6c0 100644 --- a/Make.rules +++ b/Make.rules @@ -35,4 +35,7 @@ $(strip $(foreach x,$(DEFAULT_$(1)), $(eval override $(1)+=$(x))))) endef +%.o : %.S + $(CC) $(CFLAGS) -c -o $@ $< + # vim:filetype=make diff --git a/Makefile b/Makefile index 6b50b8fe..1d5e9d1b 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ TARGETS += $(MMNAME) $(FBNAME) endif OBJS = shim.o globals.o mok.o netboot.o cert.o replacements.o tpm.o version.o errlog.o sbat.o sbat_data.o pe.o httpboot.o csv.o load-options.o KEYS = shim_cert.h ocsp.* ca.* shim.crt shim.csr shim.p12 shim.pem shim.key shim.cer -ORIG_SOURCES = shim.c globals.c mok.c netboot.c replacements.c tpm.c errlog.c sbat.c pe.c httpboot.c shim.h version.h $(wildcard include/*.h) +ORIG_SOURCES = shim.c globals.c mok.c netboot.c replacements.c tpm.c errlog.c sbat.c pe.c httpboot.c shim.h version.h $(wildcard include/*.h) cert.S MOK_OBJS = MokManager.o PasswordCrypt.o crypt_blowfish.o errlog.o sbat_data.o globals.o ORIG_MOK_SOURCES = MokManager.c PasswordCrypt.c crypt_blowfish.c shim.h $(wildcard include/*.h) FALLBACK_OBJS = fallback.o tpm.o errlog.o sbat_data.o globals.o @@ -108,9 +108,6 @@ shim.o: shim_cert.h endif shim.o: $(wildcard $(TOPDIR)/*.h) -cert.o : $(TOPDIR)/cert.S - $(CC) $(CFLAGS) -c -o $@ $< - sbat.%.csv : data/sbat.%.csv $(DOS2UNIX) $(D2UFLAGS) $< $@ tail -c1 $@ | read -r _ || echo >> $@ # ensure a trailing newline -- cgit v1.2.3