[SPARC]: Add Ravnborg Makefile cleanups.

arch/sparc/Makefile

@@ -53,27 +53,26 @@ NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))
 LIBS_Y		:= $(patsubst %/, %/lib.a, $(libs-y))
 export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD
 
-image: vmlinux
-	$(MAKE) -C arch/sparc/boot image
+makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
+
+image tftpboot.img: vmlinux
+	$(call makeboot,arch/sparc/boot/$@)
 
 archclean:
-	rm -f $(TOPDIR)/vmlinux.aout
-	-$(MAKE) -C arch/sparc/boot clean
+	$(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
 
 archmrproper:
-	rm -f $(TOPDIR)/include/asm-sparc/asm_offsets.h
 
 prepare: include/asm-$(ARCH)/asm_offsets.h
 
 arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
 				   include/config/MARKER
 
-include/asm-$(ARCH)/asm_offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
-	@$(generate-asm-offsets.h) < $< > $@
-
-include/asm-$(ARCH)/asm_offsets.h: include/asm-$(ARCH)/asm_offsets.h.tmp
+include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
 	@echo -n '  Generating $@'
+	@$(generate-asm-offsets.h) < $< > $@.tmp
 	@$(update-if-changed)
 
-tftpboot.img:
-	$(MAKE) -C arch/sparc/boot tftpboot.img
+CLEAN_FILES +=	include/asm-$(ARCH)/asm_offsets.h.tmp	\
+		include/asm-$(ARCH)/asm_offsets.h	\
+		arch/$(ARCH)/kernel/asm-offsets.s

arch/sparc/boot/Makefile

@@ -4,38 +4,35 @@
 # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 # Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz)
 
-ROOT_IMG	=/usr/src/root.img
-ELFTOAOUT	=elftoaout
+ROOT_IMG	:= /usr/src/root.img
+ELFTOAOUT	:= elftoaout
 
-all: btfix.o
+host-progs	:= piggyback btfixupprep
+EXTRA_TARGETS	:= tftpboot.img btfix.o btfix.s image
 
-tftpboot.img: piggyback
-	$(ELFTOAOUT) $(TOPDIR)/vmlinux -o tftpboot.img
-	./piggyback tftpboot.img $(TOPDIR)/System.map $(ROOT_IMG)
-
-piggyback: piggyback.c
-	$(HOSTCC) $(HOSTCFLAGS) -o piggyback piggyback.c
-
-btfixupprep: btfixupprep.c
-	$(HOSTCC) $(HOSTCFLAGS) -o btfixupprep btfixupprep.c
-
-clean:
-	rm -f btfixupprep piggyback tftpboot.img btfix.o btfix.s image
+quiet_cmd_elftoaout	= ELFTOAOUT $@
+      cmd_elftoaout	= $(ELFTOAOUT) $(obj)/image -o $@
+quiet_cmd_piggy		= PIGGY $@
+      cmd_piggy		= $(obj)/piggyback $@ $(obj)/System.map $(ROOT_IMG)
+quiet_cmd_btfix		= BTFIX $@
+      cmd_btfix		= $(OBJDUMP) -x vmlinux | $(obj)/btfixupprep > $@
 
 BTOBJS := $(HEAD) $(INIT_Y)
 BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y)
+LDFLAGS_image := -T arch/sparc/vmlinux.lds.s $(BTOBJS) --start-group $(BTLIBS) --end-group
 
 # Actual linking
-image: btfix.o
-	$(LD) $(LDFLAGS) -T ../vmlinux.lds.s \
-		$(patsubst %,$(TOPDIR)/%,$(BTOBJS)) \
-		--start-group \
-		$(patsubst %,$(TOPDIR)/%,$(BTLIBS)) \
-		btfix.o \
-		--end-group -o image
-
-btfix.s: btfixupprep $(TOPDIR)/vmlinux
-	$(OBJDUMP) -x $(TOPDIR)/vmlinux | ./btfixupprep > btfix.s
-
-btfix.o: btfix.s
-	$(CC) -c -o btfix.o btfix.s
+$(obj)/image: $(obj)/btfix.o FORCE
+	$(call if_changed,ld)
+	$(NM) $@ | grep -v  '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > $(obj)/System.map
+
+$(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE
+	$(call if_changed,elftoaout)
+	$(call if_changed,piggy)
+
+$(obj)/btfix.s: $(obj)/btfixupprep vmlinux FORCE
+	$(call if_changed,btfix)
+
+archhelp:
+	@echo '* image		- kernel image ($(obj)/image)'
+	@echo '  tftpboot.img	- image prepared for tftp'

arch/sparc/kernel/Makefile

@@ -2,15 +2,13 @@
 # Makefile for the linux kernel.
 #
 
-SH = $(CONFIG_SHELL)
-
 EXTRA_TARGETS	:= head.o init_task.o
 
-EXTRA_AFLAGS := -ansi
+EXTRA_AFLAGS	:= -ansi
 
 export-objs := sparc_ksyms.o
 IRQ_OBJS := irq.o sun4m_irq.o sun4c_irq.o sun4d_irq.o
-obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o ${IRQ_OBJS} \
+obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \
 	    process.o signal.o ioport.o setup.o idprom.o \
 	    sys_sparc.o sunos_asm.o systbls.o \
 	    time.o windows.o cpu.o devices.o sclow.o \