Commit 08e57ddd authored by Kai Germaschewski's avatar Kai Germaschewski

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 ;)
parent 16aadefd
...@@ -12,7 +12,7 @@ space := $(empty) $(empty) ...@@ -12,7 +12,7 @@ space := $(empty) $(empty)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
ifdef O_TARGET 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 endif
ifdef L_TARGET ifdef L_TARGET
...@@ -402,6 +402,7 @@ targets += $(multi-used-y) $(multi-used-m) ...@@ -402,6 +402,7 @@ targets += $(multi-used-y) $(multi-used-m)
host-progs-single := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(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 := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs)) 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-single := $(addprefix $(obj)/,$(host-progs-single))
host-progs-multi := $(addprefix $(obj)/,$(host-progs-multi)) host-progs-multi := $(addprefix $(obj)/,$(host-progs-multi))
host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs)) host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
......
...@@ -25,7 +25,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA ...@@ -25,7 +25,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
#RAMDISK := -DRAMDISK=512 #RAMDISK := -DRAMDISK=512
EXTRA_TARGETS := vmlinux.bin bvmlinux.bin bootsect bootsect.o \ EXTRA_TARGETS := vmlinux.bin bootsect bootsect.o \
setup setup.o zImage bzImage setup setup.o zImage bzImage
host-progs := tools/build host-progs := tools/build
...@@ -81,8 +81,7 @@ install: $(BOOTIMAGE) ...@@ -81,8 +81,7 @@ install: $(BOOTIMAGE)
clean: clean:
@echo 'Cleaning up (boot)' @echo 'Cleaning up (boot)'
@rm -f $(addprefix $(obj)/,tools/build vmlinux.bin bvmlinux.bin \ @rm -f $(host-progs) $(EXTRA_TARGETS)
bootsect zImage bsetup bbootsect bzImage)
+@$(call descend,$(obj)/compressed) clean +@$(call descend,$(obj)/compressed) clean
archhelp: archhelp:
......
...@@ -27,4 +27,4 @@ $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE ...@@ -27,4 +27,4 @@ $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
clean: clean:
@echo 'Cleaning up (boot/compressed)' @echo 'Cleaning up (boot/compressed)'
@rm -f $(addprefix $(obj)/,vmlinux vmlinux.bin vmlinux.bin.gz) @rm -f $(EXTRA_TARGETS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment