kbuild: arch/ppc64 cleanup / O_TARGET removal

arch/ppc64/Makefile

@@ -26,15 +26,8 @@ CPP		= $(CC) -E $(CFLAGS)
 
 HEAD := arch/ppc64/kernel/head.o
 
-ARCH_SUBDIRS = arch/ppc64/kernel arch/ppc64/mm arch/ppc64/lib
-SUBDIRS := $(SUBDIRS) $(ARCH_SUBDIRS)
-ARCHIVES := arch/ppc64/kernel/kernel.o arch/ppc64/mm/mm.o arch/ppc64/lib/lib.o $(ARCHIVES)
-CORE_FILES := arch/ppc64/kernel/kernel.o arch/ppc64/mm/mm.o arch/ppc64/lib/lib.o $(CORE_FILES)
-
-ifdef CONFIG_XMON
-SUBDIRS += arch/ppc64/xmon
-CORE_FILES += arch/ppc64/xmon/x.o
-endif
+core-y			+= arch/ppc64/kernel/ arch/ppc64/mm/ arch/ppc64/lib/
+core-$(CONFIG_XMON)	+= arch/ppc64/xmon/
 
 MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 

arch/ppc64/kernel/Makefile

@@ -6,7 +6,6 @@ EXTRA_CFLAGS = -mno-minimal-toc
 
 KHEAD := head.o
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= $(KHEAD)
 
 export-objs         := ppc_ksyms.o

arch/ppc64/lib/Makefile

@@ -2,8 +2,6 @@
 # Makefile for ppc64-specific library files..
 #
 
-O_TARGET = lib.o
-
 export-objs     := dec_and_lock.o
 
 obj-y           := checksum.o dec_and_lock.o string.o strcase.o copypage.o \

arch/ppc64/mm/Makefile

 #
 # Makefile for the linux ppc-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...
 
 EXTRA_CFLAGS = -mno-minimal-toc
 
-O_TARGET := mm.o
-
 obj-y           := fault.o init.o extable.o imalloc.o
 obj-$(CONFIG_DISCONTIGMEM) += numa.o
 

arch/ppc64/xmon/Makefile

@@ -2,8 +2,6 @@
 
 EXTRA_CFLAGS = -mno-minimal-toc
 
-O_TARGET = x.o
-
 obj-y       := start.o xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
 
 include $(TOPDIR)/Rules.make