kbuild: Remove some compatibility code, $(echo_target)

Including Rules.make after make -C stopped working with the
fixdep changes, so the other code trying to salvage backward
compatibility should go as well.

Makefile

@@ -833,12 +833,10 @@ endif # ifdef include-config
 # FIXME Should go into a make.lib or something 
 # ===========================================================================
 
-echo_target = $@
-
 a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
 	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
 
-quiet_cmd_as_s_S = CPP     $(echo_target)
+quiet_cmd_as_s_S = CPP     $@
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
 
 # read all saved command lines

Rules.make

@@ -28,20 +28,12 @@ ifdef list-multi
 $(warning kbuild: $(obj)/Makefile - list-multi := $(list-multi) is obsolete in 2.5. Please fix!)
 endif
 
-# Some paths for the Makefiles to use
-# ---------------------------------------------------------------------------
-
-# FIXME. For now, we leave it possible to use make -C or make -f
-# to do work in subdirs.
-
 ifndef obj
-obj = .
-CFLAGS := $(patsubst -I%,-I$(TOPDIR)/%,$(patsubst -I$(TOPDIR)/%,-I%,$(CFLAGS)))
-AFLAGS := $(patsubst -I%,-I$(TOPDIR)/%,$(patsubst -I$(TOPDIR)/%,-I%,$(AFLAGS)))
+$(warning kbuild: Rules.make is included improperly)
 endif
 
-# For use in the quiet output
-echo_target = $@
+# Some paths for the Makefiles to use
+# ---------------------------------------------------------------------------
 
 # Usage:
 #
@@ -190,7 +182,7 @@ endif # ! fastdep
 # Shipped files
 # ===========================================================================
 
-quiet_cmd_shipped = SHIPPED $(echo_target)
+quiet_cmd_shipped = SHIPPED $@
 cmd_shipped = cat $< > $@
 
 %:: %_shipped
@@ -210,20 +202,20 @@ cmd_shipped = cat $< > $@
 # Linking
 # ---------------------------------------------------------------------------
 
-quiet_cmd_ld = LD      $(echo_target)
+quiet_cmd_ld = LD      $@
 cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
 	       $(filter-out FORCE,$^) -o $@ 
 
 # Objcopy
 # ---------------------------------------------------------------------------
 
-quiet_cmd_objcopy = OBJCOPY $(echo_target)
+quiet_cmd_objcopy = OBJCOPY $@
 cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
 
 # Gzip
 # ---------------------------------------------------------------------------
 
-quiet_cmd_gzip = GZIP    $(echo_target)
+quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
 
 # ===========================================================================

arch/i386/boot/Makefile

@@ -46,7 +46,7 @@ $(obj)/bzImage: IMAGE_OFFSET := 0x100000
 $(obj)/bzImage: EXTRA_AFLAGS := -traditional $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
 $(obj)/bzImage: BUILDFLAGS   := -b
 
-quiet_cmd_image = BUILD   $(echo_target)
+quiet_cmd_image = BUILD   $@
 cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
 	    $(obj)/vmlinux.bin $(ROOT_DEV) > $@
 

arch/x86_64/boot/Makefile

@@ -46,7 +46,7 @@ $(obj)/bzImage: IMAGE_OFFSET := 0x100000
 $(obj)/bzImage: EXTRA_AFLAGS := -traditional $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
 $(obj)/bzImage: BUILDFLAGS   := -b
 
-quiet_cmd_image = BUILD   $(echo_target)
+quiet_cmd_image = BUILD   $@
 cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
 	    $(obj)/vmlinux.bin $(ROOT_DEV) > $@
 

drivers/char/Makefile

@@ -110,7 +110,7 @@ clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 include $(TOPDIR)/Rules.make
 
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-	$(call do_cmd,CONMK  $(echo_target),$(objtree)/scripts/conmakehash $< > $@)
+	$(call do_cmd,CONMK  $@,$(objtree)/scripts/conmakehash $< > $@)
 
 $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 

init/Makefile

@@ -19,5 +19,5 @@ $(obj)/version.o: $(obj)/../include/linux/compile.h
 # actual file if its content has changed.
 
 $(obj)/../include/linux/compile.h: FORCE
-	@echo -n '  Generating $(echo_target)'
+	@echo -n '  Generating $@'
 	@sh $(srctree)/scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"