diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-03-12 21:43:14 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-03-12 21:43:14 +0100 |
commit | 16a6791934a1077609482dd6c091aa8b4c39a834 (patch) | |
tree | b6dde96510863d54e51e4fe05b56562d614d687b | |
parent | x86: remove additional vestiges of the zImage/bzImage split (diff) | |
download | linux-16a6791934a1077609482dd6c091aa8b4c39a834.tar.xz linux-16a6791934a1077609482dd6c091aa8b4c39a834.zip |
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>
-rw-r--r-- | arch/x86/Makefile | 4 | ||||
-rw-r--r-- | arch/x86/boot/Makefile | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 43bd89c67e3a..f05d8c91d9e5 100644 --- 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 2a3db75b35c3..fb737ce5888d 100644 --- 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 |