kbuild: Fix arch/i386/boot clean targets

We removed some files which are long since dead, but on the other
hand forgot some of the current ones.

Also, add a missing ) in a warning (introduced and fixed by Sam Ravnborg ;)

diff --git a/Rules.make b/Rules.make
index 3da6174f3d258a42dce27ae8a7b0f5304a5b5b69..1b06db4c2b91556d0c0d20eba348b7479c446b29 100644 (file)
--- a/Rules.make
+++ b/Rules.make
@@ -12,7 +12,7 @@ space   := $(empty) $(empty)
 # ---------------------------------------------------------------------------
 
 ifdef O_TARGET
-$(error kbuild: $(obj)/Makefile - Usage of O_TARGET := $(O_TARGET) is obsolete in 2.5. Please fix!
+$(error kbuild: $(obj)/Makefile - Usage of O_TARGET := $(O_TARGET) is obsolete in 2.5. Please fix!)
 endif
 
 ifdef L_TARGET
@@ -402,6 +402,7 @@ targets += $(multi-used-y) $(multi-used-m)
 host-progs-single     := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
 host-progs-multi      := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
 host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
+host-progs           := $(addprefix $(obj)/,$(host-progs))
 host-progs-single     := $(addprefix $(obj)/,$(host-progs-single))
 host-progs-multi      := $(addprefix $(obj)/,$(host-progs-multi))
 host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index ef72d2e04650e9ea4eb1ab5fa5a3b7879bb585a6..3369bfc6770010259263ad1d677b468c8894898e 100644 (file)
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -25,7 +25,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
 
 #RAMDISK := -DRAMDISK=512
 
-EXTRA_TARGETS  := vmlinux.bin bvmlinux.bin bootsect bootsect.o \
+EXTRA_TARGETS  := vmlinux.bin bootsect bootsect.o \
                   setup setup.o zImage bzImage
 
 host-progs     := tools/build
@@ -81,8 +81,7 @@ install: $(BOOTIMAGE)
 
 clean:
        @echo 'Cleaning up (boot)'
-       @rm -f $(addprefix $(obj)/,tools/build vmlinux.bin bvmlinux.bin \
-               bootsect zImage bsetup bbootsect bzImage)
+       @rm -f $(host-progs) $(EXTRA_TARGETS)
        +@$(call descend,$(obj)/compressed) clean
 
 archhelp:

diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
index 5300c7e9b36b8cdbbfb9f3daf1c6bf67ece6238e..53af39a4408e97e6a6620ef701fc42779d2d4e74 100644 (file)
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/i386/boot/compressed/Makefile
@@ -27,4 +27,4 @@ $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
 
 clean:
        @echo 'Cleaning up (boot/compressed)'
-       @rm -f $(addprefix $(obj)/,vmlinux vmlinux.bin vmlinux.bin.gz)
+       @rm -f $(EXTRA_TARGETS)