diff options
| author | Michael Brown <mcb30@ipxe.org> | 2023-06-30 10:31:52 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2023-06-30 10:31:52 +0100 |
| commit | 2524a60550b7b81d32447782e42485997b9af175 (patch) | |
| tree | 26ed9885731a1a4b6275ac39f5c67f700ad10494 | |
| parent | 280942a92a4567796976e06d186d0a199ae0337e (diff) | |
| download | ipxe-2524a60550b7b81d32447782e42485997b9af175.tar.gz | |
[build] Avoid using multiple target patterns in pattern rules
Multiple target patterns in pattern rules are treated as grouped
targets regardless of the separator character. Newer verions of make
will generate "warning: pattern recipe did not update peer target" to
warn that the rule was expected to update all of the (implicitly)
grouped targets.
Fix by splitting all multiple target pattern rules into single target
pattern rules.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/Makefile.efi | 6 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.pcbios | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/Makefile.efi b/src/Makefile.efi index bd479b3da..6e8ad46bc 100644 --- a/src/Makefile.efi +++ b/src/Makefile.efi @@ -50,6 +50,10 @@ $(BIN)/efidrv.cab : $(BIN)/alldrv.efis # $(ALL_drv.efi) is not yet defined $(QM)$(ECHO) " [CAB] $@" $(Q)$(LCAB) -n -q $(ALL_drv.efi) $@ -$(BIN)/%.iso $(BIN)/%.usb : $(BIN)/%.efi util/genfsimg +$(BIN)/%.iso : $(BIN)/%.efi util/genfsimg + $(QM)$(ECHO) " [GENFSIMG] $@" + $(Q)util/genfsimg -o $@ $< + +$(BIN)/%.usb : $(BIN)/%.efi util/genfsimg $(QM)$(ECHO) " [GENFSIMG] $@" $(Q)util/genfsimg -o $@ $< diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios index ed8d554a7..b9f8e6c28 100644 --- a/src/arch/x86/Makefile.pcbios +++ b/src/arch/x86/Makefile.pcbios @@ -54,9 +54,15 @@ LIST_NAME_mrom := ROMS LIST_NAME_pcirom := ROMS LIST_NAME_isarom := ROMS -# ISO or FAT filesystem images +# ISO images NON_AUTO_MEDIA += iso -$(BIN)/%.iso $(BIN)/%.sdsk: $(BIN)/%.lkrn util/genfsimg +$(BIN)/%.iso : $(BIN)/%.lkrn util/genfsimg + $(QM)$(ECHO) " [GENFSIMG] $@" + $(Q)util/genfsimg -o $@ $< + +# FAT filesystem images (via syslinux) +NON_AUTO_MEDIA += sdsk +$(BIN)/%.sdsk : $(BIN)/%.lkrn util/genfsimg $(QM)$(ECHO) " [GENFSIMG] $@" $(Q)util/genfsimg -o $@ $< |