kbuild: arch/ppc cleanup / O_TARGET removal

arch/ppc/4xx_io/Makefile

@@ -2,10 +2,7 @@
 # Makefile for the linux MPC4xx ppc-specific parts 
 #
 
-O_TARGET 		:= 4xx_io.o
-
-#obj-y			:=
 
 obj-$(CONFIG_SERIAL_SICC)		+= serial_sicc.o
- 
+
 include $(TOPDIR)/Rules.make

arch/ppc/8260_io/Makefile

 #
 # Makefile for the linux MPC8xx ppc-specific parts of comm processor
 #
-# 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		:= 8260_io.o
 
 obj-y			:= commproc.o uart.o
 

arch/ppc/8xx_io/Makefile

 #
 # Makefile for the linux MPC8xx ppc-specific parts of comm processor
 #
-# 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 		:= 8xx_io.o
 
 export-objs		:= fec.o
 

arch/ppc/Makefile

@@ -53,48 +53,18 @@ else
   endif
 endif
 
-ARCH_SUBDIRS = arch/ppc/kernel arch/ppc/platforms arch/ppc/mm arch/ppc/lib
-SUBDIRS := $(SUBDIRS) $(ARCH_SUBDIRS)
-CORE_FILES := arch/ppc/kernel/kernel.o arch/ppc/platforms/platform.o \
-	arch/ppc/mm/mm.o arch/ppc/lib/lib.o $(CORE_FILES)
-
-ifdef CONFIG_MATH_EMULATION
-SUBDIRS += arch/ppc/math-emu
-CORE_FILES += arch/ppc/math-emu/math-emu.o
-endif
-
-ifdef CONFIG_XMON
-SUBDIRS += arch/ppc/xmon
-CORE_FILES += arch/ppc/xmon/x.o
-endif
+core-y				+= arch/ppc/kernel/ arch/ppc/platforms/
+				   arch/ppc/mm/     arch/ppc/lib/
+core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/
+core-$(CONFIG_XMON)		+= arch/ppc/xmon/
+core-$(CONFIG_APUS)		+= arch/ppc/amiga/
+core-$(CONFIG_PPC_ISERIES)	+= arch/ppc/iSeries/
+drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/
+drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/
+drivers-$(CONFIG_8260)		+= arch/ppc/8260_io/
 
 MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 
-ifdef CONFIG_8xx
-SUBDIRS += arch/ppc/8xx_io
-DRIVERS += arch/ppc/8xx_io/8xx_io.o
-endif
-
-ifdef CONFIG_8260
-SUBDIRS += arch/ppc/8260_io
-DRIVERS += arch/ppc/8260_io/8260_io.o
-endif
-
-ifdef CONFIG_4xx
-SUBDIRS += arch/ppc/4xx_io
-DRIVERS += arch/ppc/4xx_io/4xx_io.o
-endif
-
-ifdef CONFIG_APUS
-SUBDIRS += arch/ppc/amiga
-CORE_FILES += arch/ppc/amiga/amiga.o
-endif
-
-ifdef CONFIG_PPC_ISERIES
-SUBDIRS += arch/ppc/iSeries
-CORE_FILES += arch/ppc/iSeries/iSeries.o
-endif
-
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd pImage vmlinux.sm
 
 AFLAGS_vmlinux.lds.o	:= -Upowerpc

arch/ppc/amiga/Makefile

 #
 # Makefile for Linux arch/m68k/amiga source directory
 #
-# 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 definitions are now in the main makefile...
-
-O_TARGET := amiga.o
 
 export-objs	:= amiga_ksyms.o
 

arch/ppc/iSeries/Makefile

@@ -2,7 +2,6 @@
 # Makefile for Linux arch/ppc/iSeries source directory
 #
 
-O_TARGET := iSeries.o
 export-objs := iSeries_ksyms.o
 obj-y   += LparData.o ItLpQueue.o HvLpEvent.o HvCall.o mf.o iSeries_proc.o mf_proc.o iSeries_ksyms.o HvLpConfig.o pmc_proc.o rtc.o
 

arch/ppc/kernel/Makefile

@@ -18,7 +18,6 @@ HEAD-$(CONFIG_40x)		:= head_4xx.o
 HEAD-$(CONFIG_8xx)		:= head_8xx.o
 HEAD-$(CONFIG_PPC_ISERIES)	:= iSeries_head.o
 
-O_TARGET 	:= kernel.o
 EXTRA_TARGETS	:= $(HEAD-y)
 
 export-objs			:= ppc_ksyms.o time.o ppc405_dma.o

arch/ppc/lib/Makefile

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

arch/ppc/math-emu/Makefile

-O_TARGET			:= math-emu.o
 
 obj-y				:= math.o fmr.o lfd.o stfd.o
 

arch/ppc/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...
 
 ifdef CONFIG_PPC64BRIDGE
 EXTRA_AFLAGS		:= -Wa,-mppc64bridge
@@ -13,7 +8,6 @@ endif
 
 AFLAGS_hashtable.o	+= -I$(TOPDIR)/arch/$(ARCH)/kernel
 
-O_TARGET			:= mm.o
 obj-y				:= fault.o init.o mem_pieces.o extable.o \
 					mmu_context.o pgtable.o
 

arch/ppc/platforms/Makefile

@@ -12,8 +12,6 @@ endif
 # Extra CFLAGS so we don't have to do relative includes
 CFLAGS_pmac_setup.o	+= -I$(TOPDIR)/arch/$(ARCH)/mm
 
-O_TARGET := platform.o
-
 export-objs			:= prep_setup.o
 
 obj-$(CONFIG_CEDER)		+= ceder.o ibmnp405l.o

arch/ppc/xmon/Makefile

 # Makefile for xmon
 
-O_TARGET	:= x.o
-
 ifdef CONFIG_8xx
 obj-y		:= start_8xx.o
 else