Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux

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

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:

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)