kbuild: Remove O_TARGET in arch/i386/*

Of course it's possible to use the standard "built-in.o" in arch/* as well,
so do it for i386 - other archs still using O_TARGET are not affected by
this change.

Makefile

@@ -254,7 +254,13 @@ NETWORKS	:= net/network.o
 
 include arch/$(ARCH)/Makefile
 
-export	NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT ASFLAGS
+SUBDIRS		+= $(patsubst %/,%,$(filter %/, $(core-y) $(core-m)))
+CORE_FILES	:= $(patsubst %/, %/built-in.o, $(core-y)) $(CORE_FILES)
+
+SUBDIRS		+= $(patsubst %/,%,$(filter %/, $(drivers-y) $(drivers-m)))
+DRIVERS		+= $(patsubst %/, %/built-in.o, $(drivers-y))
+
+export	NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT
 
 # boot target
 # ---------------------------------------------------------------------------

arch/i386/Makefile

@@ -87,20 +87,14 @@ endif
 
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
-SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib
+SUBDIRS += arch/i386/lib
 
-CORE_FILES := arch/i386/kernel/kernel.o arch/i386/mm/mm.o $(CORE_FILES)
-LIBS := $(TOPDIR)/arch/i386/lib/lib.a $(LIBS) $(TOPDIR)/arch/i386/lib/lib.a
+LIBS := arch/i386/lib/lib.a $(LIBS) arch/i386/lib/lib.a
 
-ifdef CONFIG_MATH_EMULATION
-SUBDIRS += arch/i386/math-emu
-DRIVERS += arch/i386/math-emu/math.o
-endif
+core-y					+= arch/i386/kernel/ arch/i386/mm/
 
-ifdef CONFIG_PCI
-SUBDIRS	+= arch/i386/pci
-DRIVERS	+= arch/i386/pci/pci.o
-endif
+drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
+drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 
 MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
 

arch/i386/kernel/Makefile

@@ -2,9 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_TARGETS := kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
+EXTRA_TARGETS := head.o init_task.o
 
 export-objs     := mca.o i386_ksyms.o time.o
 

arch/i386/math-emu/Makefile

@@ -2,8 +2,6 @@
 #               Makefile for wm-FPU-emu
 #
 
-O_TARGET := math.o
-
 #DEBUG	= -DDEBUGGING
 DEBUG	=
 PARANOID = -DPARANOID

arch/i386/mm/Makefile

 #
 # Makefile for the linux i386-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
+export-objs := pageattr.o
 
 obj-y	:= init.o pgtable.o fault.o ioremap.o extable.o pageattr.o 
 obj-$(CONFIG_DISCONTIGMEM)	+= discontig.o
-export-objs := pageattr.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 
 include $(TOPDIR)/Rules.make

arch/i386/pci/Makefile

-O_TARGET        := pci.o
-
 obj-y		:= i386.o
 
 ifdef	CONFIG_VISWS