[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>

diff --git a/src/Makefile.efi b/src/Makefile.efi
index bd479b3da65919617212ece2b3325293c194f2e5..6e8ad46bc05923bcdd7bc8edb9b95a6ae9d4be78 100644 (file)
--- 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 ed8d554a740c03fb5ace0b03c7493d06f83f0aca..b9f8e6c2895b02eb8836b1c7ac6a69b9916382fc 100644 (file)
--- 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 $@ $<