[Qemu-devel] [PULL 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools"

[Laszlo Ersek]

We don't (can't) have a recipe for building just $(EDK2_EFIROM);
therefore, while we call the target $(EDK2_EFIROM), we actually build all
of the edk2 BaseTools. Rename the target to edk2-basetools, and update the
iPXE prerequisite accordingly. This will let other targets depend on
"edk2-basetools", where an $(EDK2_EFIROM) pre-requisite would be
misleading.

Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---

Notes:
    pull:
    
    - pick up Phil's R-b / T-b
    
    - pick up Michael's A-b
    
    - pick up Igor's R-b
    
    v4:
    
    - rebase: resolve conflicts with
    
      - commit d912e795e029 ("roms: Rename the EFIROM variable to avoid
        clashing with iPXE", 2019-04-09)
    
      - commit 1cab464136b4 ("roms: Allow passing configure options to the
        EDK2 build tools", 2019-04-09)
    
    - refresh commit message accordingly: replace EFIROM references with
      EDK2_EFIROM references
    
    - drop all previous feedback tags, consequently :(
    
      - Phil's R-b / T-b
      - Michal's R-b
      - Michael's R-b
      - Igor's T-b
    
    v3:
    
    - pick up Igor's T-b
    
    v2:
    
    - pick up Phil's R-b / T-b
    
    - pick up Michal's and Michael's R-b's

 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index 1ff78b63bb3a..93c3d467be14 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -102,7 +102,7 @@ pxe-rom-%: build-pxe-roms
 
 efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
 
-efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM)
+efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools
        $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
                -b ipxe/src/bin/$(VID)$(DID).rom \
                -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
@@ -131,7 +131,7 @@ build-efi-roms: build-pxe-roms
 #    EDK2_BASETOOLS_LDFLAGS='...' \
 #    efirom
 #
-$(EDK2_EFIROM):
+edk2-basetools:
        $(MAKE) -C edk2/BaseTools \
                EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
                EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
-- 
2.19.1.3.g30247aa5d201