x86: use targets in the boot Makefile instead of CLEAN_FILES

Impact: cleanup

Instead of using CLEAN_FILES in arch/x86/Makefile, add generated files
to targets in arch/x86/boot/Makefile, so they will get naturally
cleaned up by "make clean".

Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 43bd89c67e3a062ef8c4b042685deceeb74b54df..f05d8c91d9e51ed29b21a6b99588398182879bb2 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -194,7 +194,3 @@ define archhelp
   echo  '                  FDARGS="..."  arguments for the booted kernel'
   echo  '                  FDINITRD=file initrd for the booted kernel'
 endef
-
-CLEAN_FILES += arch/x86/boot/fdimage \
-              arch/x86/boot/image.iso \
-              arch/x86/boot/mtools.conf        
\ No newline at end of file

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 2a3db75b35c39d1ffe682c2d63e4fd759b90970f..fb737ce5888dfbd7213c171bf07ea43f88e66f6f 100644 (file)
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -23,6 +23,7 @@ ROOT_DEV      := CURRENT
 SVGA_MODE      := -DSVGA_MODE=NORMAL_VGA
 
 targets                := vmlinux.bin setup.bin setup.elf bzImage
+targets                += fdimage fdimage144 fdimage288 image.iso mtools.conf
 subdir-                := compressed
 
 setup-y                += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o