kbuild: arch/m68k cleanup / O_TARGET removal

arch/m68k/Makefile

@@ -58,79 +58,23 @@ else
 HEAD := arch/m68k/kernel/sun3-head.o
 endif 
 
-SUBDIRS += arch/m68k/kernel arch/m68k/mm arch/m68k/lib
-CORE_FILES := arch/m68k/kernel/kernel.o arch/m68k/mm/mm.o $(CORE_FILES)
-LIBS += arch/m68k/lib/lib.a
-
-ifdef CONFIG_Q40
-CORE_FILES := $(CORE_FILES) arch/m68k/q40/q40.o
-SUBDIRS := $(SUBDIRS) arch/m68k/q40
-endif
-
-ifdef CONFIG_AMIGA
-CORE_FILES := $(CORE_FILES) arch/m68k/amiga/amiga.o
-SUBDIRS := $(SUBDIRS) arch/m68k/amiga
-endif
-
-ifdef CONFIG_ATARI
-CORE_FILES := $(CORE_FILES) arch/m68k/atari/atari.o
-SUBDIRS := $(SUBDIRS) arch/m68k/atari
-endif
-
-ifdef CONFIG_MAC
-CORE_FILES := $(CORE_FILES) arch/m68k/mac/mac.o
-SUBDIRS := $(SUBDIRS) arch/m68k/mac
-endif
-
-ifdef CONFIG_HP300
-CORE_FILES := $(CORE_FILES) arch/m68k/hp300/hp300.o
-SUBDIRS := $(SUBDIRS) arch/m68k/hp300
-endif
-
-ifdef CONFIG_APOLLO
-CORE_FILES := $(CORE_FILES) arch/m68k/apollo/apollo.o
-SUBDIRS := $(SUBDIRS) arch/m68k/apollo
-endif
-
-ifdef CONFIG_MVME147
-CORE_FILES := $(CORE_FILES) arch/m68k/mvme147/mvme147.o
-SUBDIRS := $(SUBDIRS) arch/m68k/mvme147
-endif
-
-ifdef CONFIG_MVME16x
-CORE_FILES := $(CORE_FILES) arch/m68k/mvme16x/mvme16x.o
-SUBDIRS := $(SUBDIRS) arch/m68k/mvme16x
-endif
-
-ifdef CONFIG_BVME6000
-CORE_FILES := $(CORE_FILES) arch/m68k/bvme6000/bvme6000.o
-SUBDIRS := $(SUBDIRS) arch/m68k/bvme6000
-endif
-
-ifdef CONFIG_SUN3X
-CORE_FILES := $(CORE_FILES) arch/m68k/sun3x/sun3x.o arch/m68k/sun3/sun3.o
-SUBDIRS := $(SUBDIRS) arch/m68k/sun3x arch/m68k/sun3
-endif
-
-ifdef CONFIG_SUN3
-CORE_FILES := $(CORE_FILES) arch/m68k/sun3/sun3.o arch/m68k/sun3/prom/promlib.a
-SUBDIRS := $(SUBDIRS) arch/m68k/sun3 arch/m68k/sun3/prom
-endif
-
-ifdef CONFIG_M68040
-CORE_FILES := $(CORE_FILES) arch/m68k/fpsp040/fpsp.o
-SUBDIRS := $(SUBDIRS) arch/m68k/fpsp040
-endif
-
-ifdef CONFIG_M68060
-CORE_FILES := $(CORE_FILES) arch/m68k/ifpsp060/ifpsp.o
-SUBDIRS := $(SUBDIRS) arch/m68k/ifpsp060
-endif
-
-ifdef CONFIG_M68KFPU_EMU
-CORE_FILES := $(CORE_FILES) arch/m68k/math-emu/mathemu.o
-SUBDIRS := $(SUBDIRS) arch/m68k/math-emu
-endif
+core-y				+= arch/m68k/kernel/	arch/m68k/mm/
+libs-y				+= arch/m68k/lib/
+
+core-$(CONFIG_Q40)		+= arch/m68k/q40/
+core-$(CONFIG_AMIGA)		+= arch/m68k/amiga/
+core-$(CONFIG_ATARI)		+= arch/m68k/atari/
+core-$(CONFIG_MAC)		+= arch/m68k/mac/
+core-$(CONFIG_HP300)		+= arch/m68k/hp300/
+core-$(CONFIG_APOLLO)		+= arch/m68k/apollo/
+core-$(CONFIG_MVME147)		+= arch/m68k/mvme147/
+core-$(CONFIG_MVME16x)		+= arch/m68k/mvme16x/
+core-$(CONFIG_BVME6000)		+= arch/m68k/bvme6000/
+core-$(CONFIG_SUN3X)		+= arch/m68k/sun3x/	arch/m68k/sun3/
+core-$(CONFIG_SUN3)		+= arch/m68k/sun3/	arch/m68k/sun3/prom/
+core-$(CONFIG_M68040)		+= arch/m68k/fpsp040/
+core-$(CONFIG_M68060)		+= arch/m68k/ifpsp060/
+core-$(CONFIG_M68KFPU_EMU)	+= arch/m68k/math-emu/
 
 lilo:	vmlinux
 	if [ -f $(INSTALL_PATH)/vmlinux ]; then mv -f $(INSTALL_PATH)/vmlinux $(INSTALL_PATH)/vmlinux.old; fi

arch/m68k/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/m68k/apollo/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 := apollo.o
 
 obj-y		:= config.o dn_ints.o dma.o
 

arch/m68k/atari/Makefile

 #
 # Makefile for Linux arch/m68k/atari 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 := atari.o
 
 export-objs	:= atari_ksyms.o
 

arch/m68k/bvme6000/Makefile

 #
 # Makefile for Linux arch/m68k/bvme6000 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 := bvme6000.o
 
 obj-y		:= config.o bvmeints.o rtc.o
 

arch/m68k/fpsp040/Makefile

@@ -2,8 +2,6 @@
 # Makefile for Linux arch/m68k/fpsp040 source directory
 #
 
-O_TARGET := fpsp.o
-
 obj-y    := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.o \
 	    kernel_ex.o res_func.o round.o sacos.o sasin.o satan.o satanh.o \
 	    scosh.o setox.o sgetem.o sint.o slog2.o slogn.o \

arch/m68k/hp300/Makefile

 #
 # Makefile for Linux arch/m68k/hp300 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 := hp300.o
 
 obj-y		:= ksyms.o config.o ints.o time.o reboot.o
 

arch/m68k/ifpsp060/Makefile

@@ -4,8 +4,6 @@
 # License.  See the file "README.legal" in the main directory of this archive
 # for more details.
 
-O_TARGET := ifpsp.o
-
 obj-y := fskeleton.o iskeleton.o os.o
 
 EXTRA_AFLAGS := -traditional

arch/m68k/kernel/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-O_TARGET := kernel.o
-
 ifndef CONFIG_SUN3
   EXTRA_TARGETS := head.o
 else

arch/m68k/mac/Makefile

 #
 # Makefile for Linux arch/m68k/mac 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 := mac.o
 
 export-objs	:= mac_ksyms.o
 

arch/m68k/math-emu/Makefile

 #
 # Makefile for the linux kernel.
 #
-# 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...
 
 EXTRA_AFLAGS := -traditional
 
 #EXTRA_AFLAGS += -DFPU_EMU_DEBUG
 #EXTRA_CFLAGS += -DFPU_EMU_DEBUG
 
-O_TARGET := mathemu.o
-
 obj-y		:= fp_entry.o fp_scan.o fp_util.o fp_move.o fp_movem.o \
 			fp_cond.o fp_arith.o fp_log.o fp_trig.o
 

arch/m68k/mm/Makefile

 #
 # Makefile for the linux m68k-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 extable.o hwtest.o
 

arch/m68k/mvme147/Makefile

 #
 # Makefile for Linux arch/m68k/mvme147 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).
-#
-
-O_TARGET := mvme147.o
 
 obj-y		:= config.o 147ints.o
 

arch/m68k/mvme16x/Makefile

 #
 # Makefile for Linux arch/m68k/mvme16x 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 := mvme16x.o
 
 export-objs	:= mvme16x_ksyms.o
 

arch/m68k/q40/Makefile

 #
 # Makefile for Linux arch/m68k/q40 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 := q40.o
 
 obj-y		:= config.o q40ints.o 
 

arch/m68k/sun3/Makefile

-q#
-# Makefile for Linux arch/m68k/sun3 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).
+# Makefile for Linux arch/m68k/sun3 source directory
 #
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := sun3.o 
 
 export-objs	:= sun3_ksyms.o
 

arch/m68k/sun3/prom/Makefile

@@ -2,21 +2,8 @@
 # Makefile for the Sun Boot PROM interface library under
 # Linux.
 #
-# 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...
 
-OBJS  = init.o console.o printf.o  misc.o
+obj-y := init.o console.o printf.o  misc.o
 #bootstr.o init.o misc.o segment.o console.o printf.o
-all: promlib.a
-
-promlib.a: $(OBJS)
-	$(AR) rcs promlib.a $(OBJS)
-	sync
-
-dep:
-	$(CPP) $(CPPFLAGS) -M *.c > .depend
 
 include $(TOPDIR)/Rules.make

arch/m68k/sun3x/Makefile

 #
 # Makefile for Linux arch/m68k/sun3x 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 := sun3x.o
 
 export-objs	:= sun3x_ksyms.o