kbuild: arch/s390 cleanup / O_TARGET removal

arch/s390/Makefile

@@ -23,16 +23,10 @@ CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
 
 HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
-SUBDIRS += arch/s390/mm arch/s390/kernel arch/s390/lib drivers/s390
-CORE_FILES := arch/s390/mm/mm.o arch/s390/kernel/kernel.o $(CORE_FILES)
-LIBS := $(TOPDIR)/arch/s390/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390/lib/lib.a
-
-DRIVERS += drivers/s390/built-in.o
-
-ifeq ($(CONFIG_MATHEMU),y)
-  SUBDIRS += arch/s390/math-emu
-  DRIVERS += arch/s390/math-emu/math-emu.o
-endif
+core-y				+= arch/s390/mm/ arch/s390/kernel/
+drivers-y			+= drivers/s390/
+drivers-$(CONFIG_MATHEMU)	+= arch/s390/math-emu/
+libs-y				+= arch/s390/lib/
 
 all: image listing
 

arch/s390/kernel/Makefile

@@ -5,8 +5,6 @@
 EXTRA_TARGETS	:= head.o init_task.o
 EXTRA_AFLAGS	:= -traditional
 
-O_TARGET	:= kernel.o
-
 export-objs	:= debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o
 obj-y	:= entry.o bitmap.o traps.o time.o process.o irq.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

arch/s390/math-emu/Makefile

@@ -2,7 +2,6 @@
 # Makefile for the FPU instruction emulation.
 #
 
-O_TARGET := math-emu.o
 obj-$(CONFIG_MATHEMU) := math.o qrnnd.o
 
 EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w

arch/s390/mm/Makefile

 #
 # Makefile for the linux s390-specific parts of the memory manager.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := mm.o
 
 obj-y	 := init.o fault.o ioremap.o extable.o