kbuild: arch/ia64 cleanup / O_TARGET removal

arch/ia64/Makefile

@@ -33,58 +33,20 @@ ifeq ($(CONFIG_ITANIUM_BSTEP_SPECIFIC),y)
 	CFLAGS += -mb-step
 endif
 
-ifdef CONFIG_IA64_GENERIC
-	CORE_FILES      :=      arch/$(ARCH)/hp/hp.o			\
-				arch/$(ARCH)/dig/dig.a			\
-				$(CORE_FILES)
-	SUBDIRS		:=	arch/$(ARCH)/hp		\
-				arch/$(ARCH)/dig	\
-				$(SUBDIRS)
-
-else # !GENERIC
-
-ifdef CONFIG_IA64_HP_SIM
-        SUBDIRS         :=      arch/$(ARCH)/hp		\
-                                $(SUBDIRS)
-        CORE_FILES      :=      arch/$(ARCH)/hp/hp.o	\
-                                $(CORE_FILES)
-endif
+HEAD := arch/$(ARCH)/kernel/head.o arch/ia64/kernel/init_task.o
 
-ifdef CONFIG_IA64_HP_ZX1
-        SUBDIRS         :=      arch/$(ARCH)/hp				\
-				arch/$(ARCH)/dig			\
-                                $(SUBDIRS)
-        CORE_FILES      :=      arch/$(ARCH)/hp/hp.o			\
-				arch/$(ARCH)/dig/dig.a			\
-                                $(CORE_FILES)
-endif
+core-$(CONFIG_IA64_GENERIC) 	+= arch/$(ARCH)/hp/	  arch/$(ARCH)/dig/
+core-$(CONFIG_IA64_HP_SIM)	+= arch/$(ARCH)/hp/
+core-$(CONFIG_IA64_HP_ZX1)	+= arch/$(ARCH)/hp/ 	  arch/$(ARCH)/dig/
+core-$(CONFIG_IA64_SGI_SN)	+= arch/$(ARCH)/sn/kernel arch/$(ARCH)/sn/io
+core-$(CONFIG_IA64_DIG) 	+= arch/$(ARCH)/dig/
 
 ifdef CONFIG_IA64_SGI_SN
-	CFLAGS		+= -DBRINGUP
-        SUBDIRS         :=      arch/$(ARCH)/sn/kernel	\
-				arch/$(ARCH)/sn/io	\
-				arch/$(ARCH)/sn/fakeprom	\
-				$(SUBDIRS)
-        CORE_FILES      :=      arch/$(ARCH)/sn/kernel/sn.o	\
-				arch/$(ARCH)/sn/io/sgiio.o	\
-				$(CORE_FILES)
-endif
-
-ifdef CONFIG_IA64_DIG
-        SUBDIRS         :=      arch/$(ARCH)/dig	\
-				$(SUBDIRS)
-        CORE_FILES      :=      arch/$(ARCH)/dig/dig.a	\
-				$(CORE_FILES)
+	CFLAGS			+= -DBRINGUP
+        SUBDIRS         	+= arch/$(ARCH)/sn/fakeprom
 endif
 
-endif # !GENERIC
-
-ifdef CONFIG_IA32_SUPPORT
-	SUBDIRS		:=	arch/$(ARCH)/ia32 $(SUBDIRS)
-	CORE_FILES	:=	arch/$(ARCH)/ia32/ia32.o $(CORE_FILES)
-endif
-
-HEAD := arch/$(ARCH)/kernel/head.o arch/ia64/kernel/init_task.o
+core-$(CONFIG_IA32_SUPPORT)	+= arch/$(ARCH)/ia32/
 
 libs-y				+= arch/$(ARCH)/lib/
 core-y				+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/

arch/ia64/dig/Makefile

@@ -5,8 +5,6 @@
 # Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
 #
 
-O_TARGET := dig.a
-
 obj-y := setup.o
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
 

arch/ia64/hp/Makefile

 # arch/ia64/hp/Makefile
 # Copyright (c) 2002 Matthew Wilcox for Hewlett Packard
 
-ALL_SUB_DIRS := sim zx1 common
-
-O_TARGET := hp.o
-
-subdir-$(CONFIG_IA64_GENERIC) += $(ALL_SUB_DIRS)
-subdir-$(CONFIG_IA64_HP_SIM) += sim
-
-SUB_DIRS := $(subdir-y)
-obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
+obj-$(CONFIG_IA64_GENERIC)	+= sim/ zx1/ common/
+obj-$(CONFIG_IA64_HP_SIM)	+= sim/
 
 include $(TOPDIR)/Rules.make

arch/ia64/hp/sim/Makefile

@@ -7,8 +7,6 @@
 # Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
 #
 
-O_TARGET := sim.o
-
 obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o
 obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
 

arch/ia64/ia32/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
 
-O_TARGET := ia32.o
-
 obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o ia32_support.o ia32_traps.o \
 	 binfmt_elf32.o ia32_ldt.o
 

arch/ia64/sn/io/Makefile

@@ -15,11 +15,7 @@
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN
 
-O_TARGET := sgiio.o
-
-ifeq ($(CONFIG_MODULES),y)
 export-objs = pciio.o hcl.o
-endif
 
 obj-y  := stubs.o sgi_if.o pciio.o xtalk.o xbow.o xswitch.o klgraph_hack.o \
 		hcl.o labelcl.o invent.o klgraph.o klconflib.o sgi_io_sim.o \

arch/ia64/sn/kernel/Makefile

@@ -33,22 +33,11 @@
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN
 
-O_TARGET        = sn.o
-
-ifeq ($(CONFIG_MODULES),y)
-export-objs = sn_ksyms.o
-endif
-
-subdir-$(CONFIG_IA64_SGI_SN1)	= sn1
-subdir-$(CONFIG_IA64_SGI_SN2)	= sn2
+export-objs 	:= sn_ksyms.o
 
 obj-y		= probe.o setup.o sn_asm.o sv.o bte.o
-obj-$(CONFIG_IA64_SGI_SN1)      += irq.o mca.o
-obj-$(CONFIG_IA64_SGI_SN2)      += irq.o mca.o
-
-obj-$(CONFIG_IA64_SGI_SN1)      += sn1/sn1.a  
-obj-$(CONFIG_IA64_SGI_SN2)      += sn2/sn2.a  
-
+obj-$(CONFIG_IA64_SGI_SN1)      += irq.o mca.o sn1/
+obj-$(CONFIG_IA64_SGI_SN2)      += irq.o mca.o sn2/
 obj-$(CONFIG_IA64_SGI_AUTOTEST) += llsc4.o misctest.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
 obj-$(CONFIG_MODULES)           += sn_ksyms.o

arch/ia64/sn/kernel/sn1/Makefile

@@ -32,8 +32,6 @@
 # http://oss.sgi.com/projects/GenInfo/NoticeExplan
 #
 
-O_TARGET := sn1.a
-
 obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
 
 EXTRA_CFLAGS := -DLITTLE_ENDIAN

arch/ia64/sn/kernel/sn2/Makefile

@@ -32,8 +32,6 @@
 # http://oss.sgi.com/projects/GenInfo/NoticeExplan
 #
 
-O_TARGET := sn2.a
-
 obj-y := cache.o iomv.o sn2_smp.o
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN