Merge

Makefile

@@ -110,56 +110,8 @@ NETWORKS	=net/network.o
 LIBS		=$(TOPDIR)/lib/lib.a
 SUBDIRS		=init kernel lib drivers mm fs net ipc sound
 
-DRIVERS-n :=
-DRIVERS-y :=
-DRIVERS-m :=
-DRIVERS-  :=
-
-DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
-DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
-DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
-DRIVERS-y += drivers/base/base.o \
-	drivers/char/char.o \
-	drivers/block/block.o \
-	drivers/misc/misc.o \
-	drivers/net/net.o \
-	drivers/media/media.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
-DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
-DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
-DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
-DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
-
-ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
-DRIVERS-y += drivers/cdrom/driver.o
-endif
-
+DRIVERS-y 	= drivers/built-in.o
 DRIVERS-$(CONFIG_SOUND) += sound/sound.o
-DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
-DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
-DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
-DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
-DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
-DRIVERS-$(CONFIG_VT) += drivers/video/video.o
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
-DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
-DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
-DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
-DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
-DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
-DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
-DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
-DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
-DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
-DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
-DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
 
 DRIVERS := $(DRIVERS-y)
 

Rules.make

@@ -2,30 +2,6 @@
 # This file contains rules which are shared between multiple Makefiles.
 #
 
-#
-# Special variables which should not be exported
-#
-unexport EXTRA_AFLAGS
-unexport EXTRA_CFLAGS
-unexport EXTRA_LDFLAGS
-unexport EXTRA_ARFLAGS
-unexport SUBDIRS
-unexport SUB_DIRS
-unexport ALL_SUB_DIRS
-unexport MOD_SUB_DIRS
-unexport O_TARGET
-
-unexport obj-y
-unexport obj-m
-unexport obj-n
-unexport obj-
-unexport export-objs
-unexport subdir-y
-unexport subdir-m
-unexport subdir-n
-unexport subdir-
-unexport mod-subdirs
-
 # Some standard vars
 
 comma   := ,
@@ -76,7 +52,7 @@ obj-m		:= $(filter-out %/, $(obj-m))
 # add it to $(subdir-m)
 
 both-m          := $(filter $(mod-subdirs), $(subdir-y))
-SUB_DIRS	:= $(subdir-y)
+SUB_DIRS	:= $(subdir-y) $(if $(BUILD_MODULES),$(subdir-m))
 MOD_SUB_DIRS	:= $(sort $(subdir-m) $(both-m))
 ALL_SUB_DIRS	:= $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
 
@@ -107,14 +83,14 @@ multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)))
 subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
 
 # Replace multi-part objects by their individual parts, look at local dir only
-real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m)))
+real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m))) $(EXTRA_TARGETS)
 real-objs-m := $(foreach m, $(obj-m), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m)))
 
 # ==========================================================================
 #
 # Get things started.
 #
-first_rule: all_targets
+first_rule: vmlinux $(if $(BUILD_MODULES),$(obj-m))
 
 #
 # Common rules
@@ -197,7 +173,7 @@ endif
 # Build the compiled-in targets
 # ---------------------------------------------------------------------------
 
-all_targets: $(O_TARGET) $(L_TARGET) sub_dirs
+vmlinux: $(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS) sub_dirs
 
 # To build objects in subdirs, we need to descend into the directories
 $(sort $(subdir-obj-y)): sub_dirs ;
@@ -282,8 +258,7 @@ $(patsubst %,_modinst_%,$(MOD_SUB_DIRS)) : FORCE
 endif
 
 .PHONY: modules
-modules: $(obj-m) FORCE \
-	 $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
+modules: $(obj-m) FORCE $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
 
 .PHONY: _modinst__
 _modinst__: FORCE
@@ -293,8 +268,7 @@ ifneq "$(strip $(obj-m))" ""
 endif
 
 .PHONY: modules_install
-modules_install: _modinst__ \
-	 $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
+modules_install: _modinst__ $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
 
 
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.

arch/alpha/kernel/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...
 
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o
 
-EXTRA_AFLAGS := $(CFLAGS)
+EXTRA_AFLAGS	:= $(CFLAGS)
 
 export-objs := alpha_ksyms.o
 
@@ -97,7 +93,7 @@ endif
 
 endif # GENERIC
 
-all: kernel.o head.o
+include $(TOPDIR)/Rules.make
 
 ASM_OFFSETS_H = $(TOPDIR)/include/asm-alpha/asm_offsets.h
 asm_offsets:
@@ -112,4 +108,3 @@ asm_offsets:
 clean::
 	rm -f check_asm
 
-include $(TOPDIR)/Rules.make

arch/arm/Makefile

@@ -189,7 +189,7 @@ endif
 
 ifeq ($(findstring y,$(CONFIG_ARCH_CLPS7500) $(CONFIG_ARCH_L7200)),y)
 SUBDIRS		+=drivers/acorn/char
-DRIVERS		+=drivers/acorn/char/acorn-char.o
+DRIVERS		+=drivers/acorn/char/built-in.o
 endif
 
 MAKEBOOT	 =$(MAKE) -C arch/$(ARCH)/boot

arch/arm/kernel/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).
+
+O_TARGET := kernel.o
 
 ENTRY_OBJ = entry-$(PROCESSOR).o
 
 AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR)
 
-O_TARGET	:= kernel.o
-
 # Object file lists.
 
 obj-y		:= arch.o compat.o dma.o $(ENTRY_OBJ) entry-common.o irq.o   \
@@ -43,7 +40,7 @@ head-y			:= head.o
 obj-$(CONFIG_DEBUG_LL)	+= debug.o
 endif
 
-all: kernel.o $(head-y) init_task.o
+EXTRA_TARGETS := $(head-y) init_task.o
 
 include $(TOPDIR)/Rules.make
 

arch/arm/mach-arc/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).
 
 O_TARGET		:= arc.o
 
@@ -19,8 +16,8 @@ export-objs		:= oldlatches.o
 
 obj-$(CONFIG_DEBUG_LL)	+= debug.o
 
-all: arc.o head.o
+EXTRA_TARGETS 		:= head.o
 
-include $(TOPDIR)/Rules.make
+AFLAGS_head.o		:= -DTEXTADDR=$(TEXTADDR)
 
-AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR)
+include $(TOPDIR)/Rules.make

arch/cris/kernel/Makefile

@@ -2,15 +2,9 @@
 #
 # 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...
-
-all: kernel.o head.o
 
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o
 
 export-objs := ksyms.o
 

arch/i386/kernel/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
 
-all: kernel.o head.o init_task.o
+EXTRA_TARGETS := head.o init_task.o
 
 O_TARGET := kernel.o
 
@@ -36,4 +29,6 @@ obj-y += setup-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 endif
 
+EXTRA_AFLAGS	:= -traditional
+
 include $(TOPDIR)/Rules.make

arch/ia64/dig/Makefile

@@ -5,13 +5,9 @@
 # Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
 #
 
-all: dig.a
-
 O_TARGET := dig.a
 
 obj-y := setup.o
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
 
-clean::
-
 include $(TOPDIR)/Rules.make

arch/ia64/ia32/Makefile

@@ -2,13 +2,9 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
 
-all: ia32.o
-
 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
 
-clean::
-
 include $(TOPDIR)/Rules.make

arch/ia64/kernel/Makefile

@@ -2,9 +2,8 @@
 # Makefile for the linux kernel.
 #
 
-all: kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs := ia64_ksyms.o
 

arch/ia64/sn/kernel/sn1/Makefile

@@ -32,14 +32,10 @@
 # http://oss.sgi.com/projects/GenInfo/NoticeExplan
 #
 
-EXTRA_CFLAGS    := -DLITTLE_ENDIAN
+O_TARGET := sn1.a
 
-all: sn1.a
+obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
 
-O_TARGET        = sn1.a
-
-obj-y          = cache.o error.o iomv.o synergy.o sn1_smp.o
-
-clean::
+EXTRA_CFLAGS := -DLITTLE_ENDIAN
 
 include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/sn2/Makefile

@@ -32,14 +32,11 @@
 # http://oss.sgi.com/projects/GenInfo/NoticeExplan
 #
 
-EXTRA_CFLAGS    := -DLITTLE_ENDIAN
-
-all: sn2.a
-
-O_TARGET        = sn2.a
+O_TARGET := sn2.a
 
-obj-y          = cache.o iomv.o sn2_smp.o
+obj-y := cache.o iomv.o sn2_smp.o
 
-clean::
+EXTRA_CFLAGS    := -DLITTLE_ENDIAN
 
 include $(TOPDIR)/Rules.make
+

arch/m68k/fpsp040/Makefile

 #
 # Makefile for Linux arch/m68k/fpsp040 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...
-
-EXTRA_AFLAGS := -traditional
 
-OS_TARGET := fpsp.o
+O_TARGET := fpsp.o
 
-OS_OBJS   := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.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 \
 	    smovecr.o srem_mod.o scale.o \
@@ -19,11 +12,9 @@ OS_OBJS   := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.o \
 	    x_bsun.o x_fline.o x_operr.o x_ovfl.o x_snan.o x_store.o \
 	    x_unfl.o x_unimp.o x_unsupp.o bugfix.o skeleton.o
 
-all:	$(OS_TARGET)
+EXTRA_AFLAGS := -traditional
+EXTRA_LDFLAGS := -x
 
 include $(TOPDIR)/Rules.make
 
 $(OS_OBJS): fpsp.h
-
-$(OS_TARGET): $(OS_OBJS) fpsp.h
-	$(LD) -x -r -o $(OS_TARGET) $(OS_OBJS)

arch/m68k/ifpsp060/Makefile

@@ -4,17 +4,11 @@
 # License.  See the file "README.legal" in the main directory of this archive
 # for more details.
 
-EXTRA_AFLAGS := -traditional
-
-OS_TARGET := ifpsp.o
+O_TARGET := ifpsp.o
 
-OS_OBJS	  := fskeleton.o iskeleton.o os.o
+obj-y := fskeleton.o iskeleton.o os.o
 
-all:	$(OS_TARGET)
+EXTRA_AFLAGS := -traditional
+EXTRA_LDFLAGS := -x
 
 include $(TOPDIR)/Rules.make
-
-$(OS_OBJS):
-
-$(OS_TARGET): $(OS_OBJS)
-	$(LD) -x -r -o $(OS_TARGET) $(OS_OBJS)

arch/m68k/kernel/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
+O_TARGET := kernel.o
 
 ifndef CONFIG_SUN3
-all: head.o kernel.o
+  EXTRA_TARGETS := head.o
 else
-all: sun3-head.o kernel.o
+  EXTRA_TARGETS := sun3-head.o
 endif 
 
-O_TARGET := kernel.o
-
 export-objs	:= setup.o m68k_ksyms.o
 
 obj-y		:= entry.o process.o traps.o ints.o signal.o ptrace.o \
@@ -24,6 +17,10 @@ obj-y		:= entry.o process.o traps.o ints.o signal.o ptrace.o \
 
 obj-$(CONFIG_PCI)	+= bios32.o
 
+EXTRA_AFLAGS := -traditional
+
+include $(TOPDIR)/Rules.make
+
 head.o: head.S m68k_defs.h
 
 entry.o: entry.S m68k_defs.h
@@ -39,4 +36,3 @@ m68k_defs.h: m68k_defs.c m68k_defs.head
 	rm m68k_defs.s
 -include m68k_defs.d
 
-include $(TOPDIR)/Rules.make

arch/mips/au1000/common/Makefile

@@ -5,14 +5,6 @@
 #
 # Makefile for the Alchemy Au1000 CPU, generic files.
 #
-# 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).
-#
-
-EXTRA_AFLAGS := $(CFLAGS)
-
-all: au1000.o
 
 O_TARGET := au1000.o
 
@@ -22,7 +14,9 @@ obj-$(CONFIG_AU1000_UART) += serial.o
 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o             
 obj-$(CONFIG_BLK_DEV_INITRD) += ramdisk.o
 
-ramdisk.o: 
-	mkramobj ramdisk ramdisk.o
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make
+
+ramdisk.o: 
+	mkramobj ramdisk ramdisk.o

arch/mips/au1000/pb1000/Makefile

@@ -5,12 +5,6 @@
 #
 # Makefile for the Alchemy Semiconductor PB1000 board.
 #
-# 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).
-#
-
-all: pb1000.o
 
 O_TARGET := pb1000.o
 

arch/mips/baget/Makefile

@@ -2,13 +2,6 @@
 # Makefile for the Baget specific kernel interface routines
 # 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...
-
-all: baget.a 
 
 O_TARGET := baget.a
 
@@ -18,10 +11,11 @@ obj-y			:= baget.o print.o setup.o time.o irq.o bagetIRQ.o \
 obj-$(CONFIG_SERIAL)	+= vacserial.o
 obj-$(CONFIG_VAC_RTC)	+= vacrtc.o
 
+include $(TOPDIR)/Rules.make
+
 bagetIRQ.o : bagetIRQ.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-
 ##################### Baget Loader stuff ########################
 
 image: ../../../vmlinux
@@ -61,4 +55,3 @@ balo:   balo.o dummy.o balo_supp.o print.o
 clean:
 	rm -f balo balo.h dummy.c image image.bin
 
-include $(TOPDIR)/Rules.make

arch/mips/dec/Makefile

 #
 # Makefile for the DECstation family specific parts of the 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).
-#
 
 O_TARGET := dec.o
 
-all: dec.o
-
 export-objs := wbflush.o
+
 obj-y	 := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o
 
 obj-$(CONFIG_PROM_CONSOLE)	+= promcon.o
 
-int-handler.o:	int-handler.S
-
 include $(TOPDIR)/Rules.make

arch/mips/dec/boot/Makefile

 #
 # Makefile for the DECstation family specific parts of the 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).
-#
 
 netboot: all
 	mipsel-linux-ld -N -G 0 -T ld.ecoff ../../boot/zImage \
 		dec_boot.o ramdisk.img -o nbImage
 
-all: dec_boot.o
-
 O_TARGET := dec_boot.o
 
 obj-y	 := decstation.o

arch/mips/dec/prom/Makefile

@@ -2,25 +2,14 @@
 # Makefile for the DECstation prom monitor library routines
 # 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...
-
-EXTRA_AFLAGS := $(CFLAGS)
 
-OBJS  = init.o memory.o cmdline.o identify.o locore.o
+L_TARGET := rexlib.a
 
-all: 	rexlib.a
+obj-y := init.o memory.o cmdline.o identify.o locore.o
 
-rexlib.a: $(OBJS)
-	$(AR) rcs rexlib.a $(OBJS)
-	sync
+EXTRA_AFLAGS := $(CFLAGS)
 
-locore.o: locore.S
+include $(TOPDIR)/Rules.make
 
 dep:
 	$(CPP) $(CPPFLAGS) -M *.c > .depend
-
-include $(TOPDIR)/Rules.make

arch/mips/ite-boards/generic/Makefile

@@ -5,14 +5,6 @@
 #
 # Makefile for the ITE 8172 (qed-4n-s01b) board, generic files.
 #
-# 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).
-#
-
-EXTRA_AFLAGS := $(CFLAGS)
-
-all: it8172.o
 
 O_TARGET := it8172.o
 
@@ -30,4 +22,6 @@ ifdef CONFIG_REMOTE_DEBUG
  obj-y += dbg_io.o             
 endif
 
+EXTRA_AFLAGS := $(CFLAGS)
+
 include $(TOPDIR)/Rules.make

arch/mips/ite-boards/ivr/Makefile

@@ -6,18 +6,12 @@
 # Makefile for the Globespan IVR board,
 # board-specific files.
 #
-# 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).
-#
-
-all: ivr.o
 
 O_TARGET := ivr.o
 
 obj-y := init.o 
 
-obj-CONFIG_PCI += pci_fixup.o
-obj-CONFIG_BLK_DEV_INITRD += le_ramdisk.o
+obj-$(CONFIG_PCI) += pci_fixup.o
+obj-$(CONFIG_BLK_DEV_INITRD) += le_ramdisk.o
 
 include $(TOPDIR)/Rules.make

arch/mips/ite-boards/qed-4n-s01b/Makefile

@@ -6,27 +6,14 @@
 # Makefile for the ITE 8172 (qed-4n-s01b) board, board
 # specific files.
 #
-# 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).
-#
-
-all: ite.o
 
 O_TARGET := ite.o
 
 obj-y := init.o 
+obj-$(CONFIG_PCI) += pci_fixup.o
+obj-$(CONFIG_BLK_DEV_INITRD) += le_ramdisk.o
 
-ifdef CONFIG_PCI
-obj-y += pci_fixup.o
-endif
-
-ifdef CONFIG_BLK_DEV_INITRD
-obj-y += le_ramdisk.o
-endif
-
+include $(TOPDIR)/Rules.make
 
 dep:
 	$(CPP) -M *.c > .depend
-
-include $(TOPDIR)/Rules.make

arch/mips/jazz/Makefile

 #
 # Makefile for the Jazz family specific parts of the 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).
-#
-
-EXTRA_AFLAGS := $(CFLAGS)
-
-all: jazz.o
 
 O_TARGET := jazz.o
 
 obj-y	 := int-handler.o irq.o jazzdma.o reset.o rtc-jazz.o setup.o \
 	    floppy-jazz.o kbd-jazz.o
 
-int-handler.o: int-handler.S
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make

arch/mips/kernel/Makefile

 #
 # Makefile for the Linux/MIPS 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).
-#
 
 # EXTRA_AFLAGS = -mips3 -mcpu=r4000 # not used?
 
-all:	kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 obj-y				+= branch.o process.o signal.o entry.o \
 				   traps.o ptrace.o vm86.o ioport.o reset.o \
@@ -54,7 +49,4 @@ obj-$(CONFIG_NEW_PCI)          += pci.o
 obj-$(CONFIG_PCI_AUTO)         += pci_auto.o
 endif
 
-entry.o: entry.S
-head.o: head.S
-
 include $(TOPDIR)/Rules.make

arch/mips/mips-boards/atlas/Makefile

@@ -22,13 +22,6 @@
 # Makefile for the MIPS Atlas specific kernel interface routines
 # 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...
-
-all: atlas.o
 
 O_TARGET := atlas.o
 

arch/mips/philips/nino/Makefile

 #
 # Makefile for the Philips Nino specific parts of the 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).
-#
 
 O_TARGET := nino.o
 
-all: nino.o
-
 obj-y	 := int-handler.o setup.o irq.o time.o reset.o rtc.o prom.o power.o
 
-int-handler.o: int-handler.S
-
 obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb.o
 
 obj-$(CONFIG_BLK_DEV_INITRD)	+= ramdisk.o
 
+include $(TOPDIR)/Rules.make
+
 ramdisk.o:
 		$(MAKE) -C ramdisk
 		mv ramdisk/ramdisk.o ramdisk.o
@@ -25,4 +19,3 @@ ramdisk.o:
 clean:
 		rm -f *.o
 
-include $(TOPDIR)/Rules.make

arch/mips/sgi/kernel/Makefile

@@ -2,21 +2,12 @@
 # Makefile for the SGI specific kernel interface routines
 # 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...
-
-EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET := ip22-kern.o
 
-all: ip22-kern.o indyIRQ.o
-
 obj-y	+= indy_mc.o indy_sc.o indy_hpc.o indy_int.o indy_rtc.o system.o \
 	   indyIRQ.o reset.o setup.o time.o
 
-indyIRQ.o: indyIRQ.S
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make

arch/mips/sni/Makefile

 #
 # Makefile for the SNI specific part of the 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).
-#
-
-EXTRA_AFLAGS := $(CFLAGS)
-
-all:	sni.o int-handler.o
 
 O_TARGET := sni.o
 
 obj-y	 := int-handler.o io.o irq.o pci.o pcimt_scache.o reset.o setup.o
 
-int-handler.o: int-handler.S
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make

arch/mips64/kernel/Makefile

 #
 # Makefile for the Linux/MIPS 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).
-#
-
-EXTRA_AFLAGS := $(CFLAGS)
 
-all:	kernel.o head.o init_task.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
-O_TARGET := kernel.o
-
-export-objs = mips64_ksyms.o
+export-objs	:= mips64_ksyms.o
 
 obj-y	:= branch.o entry.o proc.o process.o ptrace.o r4k_cache.o r4k_fpu.o \
 	   r4k_genex.o r4k_switch.o r4k_tlb.o r4k_tlb_debug.o r4k_tlb_glue.o \
@@ -26,5 +19,6 @@ obj-$(CONFIG_SMP)		+= smp.o
 
 AFLAGS_r4k_genex.o := -P
 AFLAGS_r4k_tlb_glue.o := -P
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make

arch/mips64/mips-boards/atlas/Makefile

@@ -22,13 +22,6 @@
 # Makefile for the MIPS Atlas specific kernel interface routines
 # 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...
-
-all: atlas.o
 
 O_TARGET := atlas.o
 

arch/mips64/mips-boards/generic/Makefile

@@ -21,15 +21,6 @@
 #
 # Makefile for the MIPS boards generic routines 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...
-
-EXTRA_AFLAGS := $(CFLAGS)
-
-all: mipsboards.o
 
 O_TARGET := mipsboards.o
 
@@ -37,4 +28,6 @@ obj-y                           := mipsIRQ.o pci.o reset.o display.o init.o \
                                    memory.o printf.o cmdline.o time.o
 obj-$(CONFIG_REMOTE_DEBUG)      += gdb_hook.o
 
+EXTRA_AFLAGS := $(CFLAGS)
+
 include $(TOPDIR)/Rules.make

arch/mips64/mips-boards/malta/Makefile

@@ -22,13 +22,6 @@
 # Makefile for the MIPS Malta specific kernel interface routines
 # 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...
-
-all: malta.o
 
 O_TARGET := malta.o
 

arch/mips64/sgi-ip32/Makefile

@@ -2,23 +2,15 @@
 # Makefile for the SGI specific kernel interface routines
 # 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...
-
-EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET := ip32-kern.a
+O_TARGET	:= ip32-kern.a
+EXTRA_TARGETS	:= ip32-irq-glue.o
 
-all: ip32-kern.a ip32-irq-glue.o
+obj-y		+= ip32-irq.o ip32-rtc.o ip32-setup.o ip32-irq-glue.o \
+	 	   ip32-berr.o ip32-timer.o crime.o
 
-obj-y	+= ip32-irq.o ip32-rtc.o ip32-setup.o ip32-irq-glue.o \
-	 ip32-berr.o ip32-timer.o crime.o
+obj-$(CONFIG_PCI) += ip32-pci.o ip32-pci-dma.o
 
-ifdef CONFIG_PCI
-obj-y   += ip32-pci.o ip32-pci-dma.o
-endif
+EXTRA_AFLAGS := $(CFLAGS)
 
 include $(TOPDIR)/Rules.make

arch/parisc/hpux/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...
 
-all: hpux.o
-O_TARGET = hpux.o
-O_OBJS = entry_hpux.o gate.o wrappers.o fs.o ioctl.o sys_hpux.o
+O_TARGET := hpux.o
+
+obj-y := entry_hpux.o gate.o wrappers.o fs.o ioctl.o sys_hpux.o
 
-.o.S:	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $*.S -o $*.o
+EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make

arch/parisc/kernel/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...
 
-all: kernel.o init_task.o pdc_cons.o process.o head.o
-O_TARGET = kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o process.o pdc_cons.o
 
 # Object file lists.
 
-obj-y		+= cache.o setup.o traps.o time.o irq.o \
-		syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \
-		inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \
-		signal.o hpmc.o \
-		real1.o real2.o led.o parisc_ksyms.o
+obj-y	     	:= cache.o setup.o traps.o time.o irq.o \
+		   syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \
+		   inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \
+		   signal.o hpmc.o \
+		   real1.o real2.o led.o parisc_ksyms.o
 
 export-objs	:= parisc_ksyms.o
 
-
 obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_VT) += keyboard.o
 obj-$(CONFIG_PCI_LBA) += lba_pci.o
@@ -32,6 +26,6 @@ obj-$(CONFIG_IOMMU_SBA) += sba_iommu.o
 # obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o
 obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o
 
-EXTRA_AFLAGS := -traditional
+EXTRA_AFLAGS	:= -traditional
 
 include $(TOPDIR)/Rules.make

arch/ppc/iSeries/Makefile

 #
 # Makefile for Linux arch/ppc/iSeries 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 := iSeries.o
 export-objs := iSeries_ksyms.o
@@ -13,7 +8,7 @@ obj-y   += LparData.o ItLpQueue.o HvLpEvent.o HvCall.o mf.o iSeries_proc.o mf_pr
 
 obj-$(CONFIG_PCI) += XmPciLpEvent.o iSeries_FlightRecorder.o iSeries_IoMmTable.o iSeries_VpdInfo.o iSeries_fixup.o iSeries_irq.o iSeries_pci.o iSeries_pci_proc.o iSeries_reset_device.o
 
-all: iSeries.o
+include $(TOPDIR)/Rules.make
 
 LparData.c:: ReleaseData.h
 
@@ -23,4 +18,3 @@ ReleaseData.h: $(TOPDIR)/Makefile
 clean:
 	rm -f ReleaseData.h
 
-include $(TOPDIR)/Rules.make

arch/ppc/kernel/Makefile

@@ -3,11 +3,6 @@
 #
 # 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...
 
 ifdef CONFIG_PPC64BRIDGE
 EXTRA_AFLAGS		:= -Wa,-mppc64bridge
@@ -25,9 +20,8 @@ HEAD-$(CONFIG_4xx)		:= head_4xx.o
 HEAD-$(CONFIG_8xx)		:= head_8xx.o
 HEAD-$(CONFIG_PPC_ISERIES)	:= iSeries_head.o
 
-all: $(HEAD-y) kernel.o
-
-O_TARGET := kernel.o
+O_TARGET 	:= kernel.o
+EXTRA_TARGETS	:= $(HEAD-y)
 
 export-objs			:= ppc_ksyms.o time.o ppc405_dma.o
 

arch/ppc/platforms/Makefile

@@ -3,11 +3,6 @@
 #
 # 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...
 
 ifdef CONFIG_PPC64BRIDGE
 EXTRA_AFLAGS		:= -Wa,-mppc64bridge
@@ -19,8 +14,6 @@ endif
 # Extra CFLAGS so we don't have to do relative includes
 CFLAGS_pmac_setup.o	+= -I$(TOPDIR)/arch/$(ARCH)/mm
 
-all: platform.o
-
 O_TARGET := platform.o
 
 export-objs			:= prep_setup.o

arch/ppc64/kernel/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_CFLAGS = -mno-minimal-toc
 
 KHEAD := head.o
 
-all: $(KHEAD) kernel.o
-
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= $(KHEAD)
 
 export-objs         := ppc_ksyms.o setup.o
 

arch/s390/Makefile

@@ -32,7 +32,7 @@ HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 SUBDIRS := $(SUBDIRS) arch/s390/mm arch/s390/kernel arch/s390/lib \
            drivers/s390 arch/s390/math-emu
 CORE_FILES := arch/s390/mm/mm.o arch/s390/kernel/kernel.o $(CORE_FILES)
-DRIVERS := $(DRIVERS) drivers/s390/io.o
+DRIVERS := $(DRIVERS) drivers/s390/built-in.o
 LIBS := $(TOPDIR)/arch/s390/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390/lib/lib.a
 
 ifeq ($(CONFIG_MATHEMU),y)

arch/s390/kernel/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...
-
-all: kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
 
-EXTRA_AFLAGS := -traditional
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o
 obj-y	:= entry.o bitmap.o traps.o time.o process.o irq.o \
@@ -26,5 +18,7 @@ obj-$(CONFIG_SMP)		+= smp.o
 #
 obj-$(CONFIG_REMOTE_DEBUG)	+= gdb-stub.o #gdb-low.o 
 
+EXTRA_AFLAGS := -traditional
+
 include $(TOPDIR)/Rules.make
 

arch/s390x/Makefile

 
-# s390/Makefile
+# s390x/Makefile
 #
 # This file is included by the global makefile so that you can add your own
 # architecture-specific flags and dependencies. Remember to do have actions
@@ -33,7 +33,7 @@ HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
 SUBDIRS := $(SUBDIRS) arch/s390x/mm arch/s390x/kernel arch/s390x/lib \
            drivers/s390
 CORE_FILES := arch/s390x/mm/mm.o arch/s390x/kernel/kernel.o $(CORE_FILES)
-DRIVERS := $(DRIVERS) drivers/s390/io.o
+DRIVERS := $(DRIVERS) drivers/s390/built-in.o
 LIBS := $(TOPDIR)/arch/s390x/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390x/lib/lib.a
 
 all: image listing

arch/s390x/kernel/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...
-
-all: kernel.o head.o init_task.o
 
 O_TARGET	:= kernel.o
-
-EXTRA_AFLAGS := -traditional
+EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o \
 		   exec32.o
@@ -31,9 +23,12 @@ obj-$(CONFIG_REMOTE_DEBUG)	+= gdb-stub.o #gdb-low.o
 obj-$(CONFIG_S390_SUPPORT)	+= linux32.o signal32.o ioctl32.o wrapper32.o exec32.o
 obj-$(CONFIG_BINFMT_ELF32)	+= binfmt_elf32.o
 
+EXTRA_AFLAGS := -traditional
+
+include $(TOPDIR)/Rules.make
+
 #
 # This is just to get the dependencies...
 #
 binfmt_elf32.o:	$(TOPDIR)/fs/binfmt_elf.c
 
-include $(TOPDIR)/Rules.make

arch/sh/kernel/Makefile

 #
 # Makefile for the Linux/SuperH 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).
-#
-
-all: kernel.o head.o init_task.o
-
-clean:
 
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= io.o io_generic.o io_hd64461.o setup_hd64461.o sh_ksyms.o
 

arch/sh/stboards/Makefile

 #
 # Makefile for STMicroelectronics board specific parts of the 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).
-#
 
-all: stboards.o
 O_TARGET := stboards.o
-obj-y := irq.o setup.o mach.o led.o
 
-clean:
+obj-y := irq.o setup.o mach.o led.o
 
 include $(TOPDIR)/Rules.make

arch/sparc/kernel/Makefile

 # $Id: Makefile,v 1.62 2000/12/15 00:41:17 davem Exp $
 # 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...
 
 SH = $(CONFIG_SHELL)
 
-all: kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 EXTRA_AFLAGS := -ansi
 
@@ -34,8 +28,7 @@ ifdef CONFIG_SUNOS_EMUL
 obj-y += sys_sunos.o sunos_ioctl.o
 endif
 
-head.o: head.S
-	$(CC) $(AFLAGS) -ansi -c $*.S -o $*.o
+include $(TOPDIR)/Rules.make
 
 check_asm: FORCE
 	@if [ ! -r $(HPATH)/asm/asm_offsets.h ] ; then \
@@ -126,6 +119,3 @@ check_asm: FORCE
 	else \
 	  mv -f asm_offsets.h $(HPATH)/asm/asm_offsets.h; \
 	fi
-
-
-include $(TOPDIR)/Rules.make

arch/sparc64/kernel/Makefile

@@ -6,9 +6,8 @@ SH = $(CONFIG_SHELL)
 
 EXTRA_AFLAGS := -ansi
 
-all: kernel.o head.o init_task.o
-
-O_TARGET := kernel.o
+O_TARGET	:= kernel.o
+EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= sparc64_ksyms.o
 obj-y		:= process.o setup.o cpu.o idprom.o \
@@ -32,10 +31,6 @@ else
   endif
 endif
 
-head.o: head.S ttable.S itlb_base.S dtlb_base.S dtlb_backend.S dtlb_prot.S \
-	etrap.S rtrap.S winfixup.S entry.S
-	$(CC) $(AFLAGS) -ansi -c $*.S -o $*.o
-
 #
 # This is just to get the dependencies...
 #
@@ -48,3 +43,6 @@ else
 endif
 
 include $(TOPDIR)/Rules.make
+
+head.o: head.S ttable.S itlb_base.S dtlb_base.S dtlb_backend.S dtlb_prot.S \
+	etrap.S rtrap.S winfixup.S entry.S

arch/x86_64/ia32/Makefile

@@ -2,14 +2,11 @@
 # Makefile for the ia32 kernel emulation subsystem.
 #
 
-export-objs := ia32_ioctl.o	
+O_TARGET := ia32.o
 
-all: ia32.o
+export-objs := ia32_ioctl.o	
 
-O_TARGET := ia32.o
 obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o \
 	ia32_binfmt.o fpu32.o socket32.o ptrace32.o
 
-clean::
-
 include $(TOPDIR)/Rules.make

arch/x86_64/kernel/Makefile

@@ -2,12 +2,8 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_AFLAGS := -traditional
-
-all: kernel.o head.o head64.o init_task.o
-
-O_TARGET := kernel.o
-
+O_TARGET	:= kernel.o
+EXTRA_TARGETS 	:= head.o head64.o init_task.o
 
 export-objs     := mtrr.o msr.o cpuid.o x8664_ksyms.o
 
@@ -31,5 +27,7 @@ obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o
 #obj-$(CONFIG_ACPI_SLEEP)       += acpi_wakeup.o
 obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
 
+EXTRA_AFLAGS := -traditional
+
 include $(TOPDIR)/Rules.make
 

drivers/Makefile

@@ -9,43 +9,43 @@
 mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
 		message scsi md ieee1394 pnp isdn atm \
 		fc4 i2c acpi bluetooth input/serio \
-		input/gameport parport hotplug
+		input/gameport parport hotplug \
+		base char block misc net media cdrom
 
-subdir-y :=	base char block net misc media cdrom
-subdir-m :=	$(subdir-y)
-
-subdir-$(CONFIG_PARPORT)	+= parport
-subdir-$(CONFIG_HOTPLUG_PCI)	+= hotplug
-subdir-$(CONFIG_DIO)		+= dio
-subdir-$(CONFIG_PCI)		+= pci
-subdir-$(CONFIG_PCMCIA)		+= pcmcia
-subdir-$(CONFIG_MTD)		+= mtd
-subdir-$(CONFIG_SBUS)		+= sbus
-subdir-$(CONFIG_ZORRO)		+= zorro
-subdir-$(CONFIG_NUBUS)		+= nubus
-subdir-$(CONFIG_TC)		+= tc
-subdir-$(CONFIG_VT)		+= video
-subdir-$(CONFIG_MAC)		+= macintosh
-subdir-$(CONFIG_ALL_PPC)	+= macintosh
-subdir-$(CONFIG_USB)		+= usb
-subdir-$(CONFIG_INPUT)		+= input
-subdir-$(CONFIG_SERIO)		+= input/serio
-subdir-$(CONFIG_GAMEPORT)	+= input/gameport
-subdir-$(CONFIG_PHONE)		+= telephony
-subdir-$(CONFIG_SGI)		+= sgi
-subdir-$(CONFIG_IDE)		+= ide
-subdir-$(CONFIG_SCSI)		+= scsi
-subdir-$(CONFIG_I2O)		+= message
-subdir-$(CONFIG_FUSION)		+= message
-subdir-$(CONFIG_MD)		+= md
-subdir-$(CONFIG_IEEE1394)	+= ieee1394
-subdir-$(CONFIG_PNP)		+= pnp
-subdir-$(CONFIG_ISDN)		+= isdn
-subdir-$(CONFIG_ATM)		+= atm
-subdir-$(CONFIG_FC4)		+= fc4
-subdir-$(CONFIG_I2C)		+= i2c
-subdir-$(CONFIG_ACPI)		+= acpi
-
-subdir-$(CONFIG_BLUEZ)		+= bluetooth
+obj-$(CONFIG_ACPI)		+= acpi/
+obj-$(CONFIG_PCI)		+= pci/
+obj-$(CONFIG_PARPORT)		+= parport/
+obj-y 				+= base/ char/ block/ misc/ net/ media/
+obj-$(CONFIG_NUBUS)		+= nubus/
+obj-$(CONFIG_ATM)		+= atm/
+obj-$(CONFIG_IDE)		+= ide/
+obj-$(CONFIG_FC4)		+= fc4/
+obj-$(CONFIG_SCSI)		+= scsi/
+obj-$(CONFIG_FUSION)		+= message/
+obj-$(CONFIG_IEEE1394)		+= ieee1394/
+obj-y				+= cdrom/
+obj-$(CONFIG_MTD)		+= mtd/
+obj-$(CONFIG_PCMCIA)		+= pcmcia/
+obj-$(CONFIG_DIO)		+= dio/
+obj-$(CONFIG_SBUS)		+= sbus/
+obj-$(CONFIG_ZORRO)		+= zorro/
+obj-$(CONFIG_ALL_PPC)		+= macintosh/
+obj-$(CONFIG_MAC)		+= macintosh/
+obj-$(CONFIG_PNP)		+= pnp/
+obj-$(CONFIG_SGI)		+= sgi/
+obj-$(CONFIG_VT)		+= video/
+obj-$(CONFIG_PARIDE) 		+= block/paride/
+obj-$(CONFIG_TC)		+= tc/
+obj-$(CONFIG_USB)		+= usb/
+obj-$(CONFIG_INPUT)		+= input/
+obj-$(CONFIG_GAMEPORT)		+= input/gameport/
+obj-$(CONFIG_SERIO)		+= input/serio/
+obj-$(CONFIG_I2O)		+= message/
+obj-$(CONFIG_I2C)		+= i2c/
+obj-$(CONFIG_PHONE)		+= telephony/
+obj-$(CONFIG_MD)		+= md/
+obj-$(CONFIG_BLUEZ)		+= bluetooth/
+obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
+obj-$(CONFIG_ISDN)		+= isdn/
 
 include $(TOPDIR)/Rules.make

drivers/acorn/Makefile

-#
-# Makefile for the Acorn-specific Linux kernel device drivers.
-#
-# 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 (not a .c file).
-
-subdir-y	:= char
-subdir-m	:= $(subdir-y)
-
-# the BLOCK subdir is included from drivers/block now
-# the SCSI subdir is included from drivers/scsi now
-# the NET subdir is included from drivers/net now
-
-include $(TOPDIR)/Rules.make

drivers/acorn/block/Makefile

@@ -2,14 +2,6 @@
 # Makefile for the Acorn block device drivers.
 #
 
-O_TARGET	:= acorn-block.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-export-objs	:=
 fd1772_mod-objs	:= fd1772.o fd1772dma.o
 mfmhd_mod-objs	:= mfmhd.o mfm.o
 

drivers/acorn/char/Makefile

 #
-# Makefile for the kernel character device drivers.
+# Makefile for the acorn character device drivers.
 #
-# 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 inherited from the
-# parent makes..
-#
-
-O_TARGET 	:= acorn-char.o
-
-# Object file lists.
-
-obj-y   	:=
-obj-m		:=
-obj-n		:=
-obj-		:=
 
 # All the objects that export symbols.
 export-objs	:= mouse_rpc.o

drivers/acpi/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux ACPI interpreter
 # 
 
-O_TARGET := acpi.o
-
 export ACPI_CFLAGS
 
 ACPI_CFLAGS	:= -D_LINUX -I$(CURDIR)/include

drivers/atm/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux network (ATM) device drivers.
 #
 
-O_TARGET := atm.o
-
 export-objs := uPD98402.o suni.o idt77105.o
 
 obj-y := atmdev_init.o

drivers/base/Makefile

-O_TARGET	:= base.o
+# Makefile for the Linux device tree
 
 obj-y		:= core.o sys.o interface.o fs.o power.o bus.o 
 

drivers/block/Makefile

@@ -8,8 +8,6 @@
 # In the future, some of these should be built conditionally.
 #
 
-O_TARGET := block.o
-
 export-objs	:= elevator.o ll_rw_blk.o blkpg.o loop.o DAC960.o genhd.o block_ioctl.o
 
 obj-y	:= elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o
@@ -33,6 +31,4 @@ obj-$(CONFIG_BLK_DEV_DAC960)	+= DAC960.o
 obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o
 obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o
 
-subdir-$(CONFIG_PARIDE) += paride
-
 include $(TOPDIR)/Rules.make

drivers/bluetooth/Makefile

@@ -2,21 +2,14 @@
 # Makefile for Bluetooth HCI device drivers.
 #
 
-O_TARGET	:= bluetooth.o
-
-list-multi	:= hci_uart.o
-
 obj-$(CONFIG_BLUEZ_HCIUSB)	+= hci_usb.o
 obj-$(CONFIG_BLUEZ_HCIVHCI)	+= hci_vhci.o
-
 obj-$(CONFIG_BLUEZ_HCIUART)	+= hci_uart.o
-uart-y				:= hci_ldisc.o
-uart-$(CONFIG_BLUEZ_HCIUART_H4)	+= hci_h4.o
-
 obj-$(CONFIG_BLUEZ_HCIDTL1)	+= dtl1_cs.o
 obj-$(CONFIG_BLUEZ_HCIBLUECARD)	+= bluecard_cs.o
 
-include $(TOPDIR)/Rules.make
+hci_uart-y				:= hci_ldisc.o
+hci_uart-$(CONFIG_BLUEZ_HCIUART_H4)	+= hci_h4.o
+hci_uart-objs				:= $(hci_uart-y)
 
-hci_uart.o: $(uart-y)
-	$(LD) -r -o $@ $(uart-y)
+include $(TOPDIR)/Rules.make

drivers/cdrom/Makefile

@@ -3,9 +3,6 @@
 # 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
 # Rewritten to use lists instead of if-statements.
 
-O_TARGET	:= driver.o
-
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/char/Makefile

@@ -7,8 +7,6 @@
 #
 FONTMAPFILE = cp437.uni
 
-O_TARGET := char.o
-
 obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o
 
 # All of the (potential) objects that export symbols.

drivers/hotplug/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux kernel pci hotplug controller drivers.
 #
 
-O_TARGET	:= vmlinux-obj.o
-
 export-objs	:= pci_hotplug_core.o pci_hotplug_util.o
 
 obj-$(CONFIG_HOTPLUG_PCI)		+= pci_hotplug.o

drivers/i2c/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the kernel i2c bus driver.
 #
 
-O_TARGET := i2c.o
-
 export-objs	:= i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
 		   i2c-algo-ite.o i2c-proc.o
 

drivers/ide/Makefile

@@ -8,15 +8,9 @@
 # In the future, some of these should be built conditionally.
 #
 
-O_TARGET := idedriver.o
-
 export-objs	:= ide-taskfile.o main.o ide.o ide-features.o ide-probe.o quirks.o pcidma.o tcq.o \
 		   atapi.o ataraid.o
 
-obj-y		:=
-obj-m		:=
-ide-obj-y	:=
-
 obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
 obj-$(CONFIG_BLK_DEV_IDE)       += ide-mod.o
 obj-$(CONFIG_BLK_DEV_IDECS)     += ide-cs.o

drivers/ieee1394/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
 
-O_TARGET := ieee1394drv.o
-
 export-objs := ieee1394_core.o ohci1394.o cmp.o
 
 ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \

drivers/input/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the input core drivers.
 #
 
-# The target object and module list name.
-
-O_TARGET	:= inputdrv.o
-
 # Objects that export symbols.
 
 mod-subdirs	:= joystick

drivers/input/gameport/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the gameport drivers.
 #
 
-# The target object and module list name.
-
-O_TARGET	:= gamedrv.o
-
 # Objects that export symbols.
 
 export-objs	:= gameport.o

drivers/input/serio/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the input core drivers.
 #
 
-# The target object and module list name.
-
-O_TARGET	:= seriodrv.o
-
 # Objects that export symbols.
 
 export-objs	:= serio.o

drivers/isdn/Makefile

 # Makefile for the kernel ISDN subsystem and device drivers.
 
-# The target object and module list name.
-
-O_TARGET	:= vmlinux-obj.o
-
 # Object files in subdirectories
 
 mod-subdirs				:= i4l hisax capi eicon

drivers/macintosh/Makefile

 #
 # Makefile for the Macintosh-specific device drivers.
 #
-# 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 inherited from the
-# parent makes..
-#
-
-# The target object and module list name.
-
-O_TARGET	:= macintosh.o
 
 # Objects that export symbols.
 

drivers/md/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the kernel software RAID and LVM drivers.
 #
 
-O_TARGET	:= mddev.o
-
 export-objs	:= md.o xor.o
 lvm-mod-objs	:= lvm.o lvm-snap.o lvm-fs.o
 

drivers/media/Makefile

 #
 # Makefile for the kernel multimedia device drivers.
 #
-# 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 inherited from the
-# parent makes..
-#
 
-subdir-y     := video radio
 mod-subdirs  := video radio
 
-O_TARGET     := media.o
-obj-y        := $(join $(subdir-y),$(subdir-y:%=/%.o))
+obj-y        := video/ radio/
 
 include $(TOPDIR)/Rules.make

drivers/media/radio/Makefile

@@ -2,15 +2,6 @@
 # Makefile for the kernel character device drivers.
 #
 
-# Object file lists.
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-O_TARGET := radio.o
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/media/video/Makefile

@@ -2,15 +2,6 @@
 # Makefile for the kernel character device drivers.
 #
 
-# Object file lists.
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-O_TARGET := video.o
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/message/Makefile

@@ -2,8 +2,6 @@
 # Makefile for MPT based block devices
 #
 
-O_TARGET := message.o
-
 mod-subdirs := i2o fusion 
 
 obj-$(CONFIG_I2O)	+= i2o/

drivers/misc/Makefile

 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
-# 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 inherited from the
-# parent makes..
-#
-
-O_TARGET := misc.o
 
 include $(TOPDIR)/Rules.make
-
-fastdep:

drivers/mtd/Makefile

@@ -5,19 +5,11 @@
 # $Id: Makefile,v 1.63 2001/06/13 09:43:07 dwmw2 Exp $
 
 
-obj-y           += chips/chipslink.o maps/mapslink.o \
-			devices/devlink.o nand/nandlink.o
-obj-m           :=
-obj-n           :=
-obj-            :=
-
-O_TARGET	:= mtdlink.o
+mod-subdirs	:= chips maps devices nand
 
 export-objs	:= mtdcore.o mtdpart.o redboot.o bootldr.o afs.o
 
-mod-subdirs	:= 
-subdir-y	:= chips maps devices nand
-subdir-m	:= $(subdir-y)
+obj-y           += chips/ maps/	devices/ nand/
 
 #                       *** BIG UGLY NOTE ***
 #

drivers/mtd/chips/Makefile

@@ -3,8 +3,6 @@
 #
 # $Id: Makefile,v 1.7 2001/10/05 06:53:51 dwmw2 Exp $
 
-O_TARGET	:= chipslink.o
-
 export-objs	:= chipreg.o gen_probe.o
 
 #                       *** BIG UGLY NOTE ***

drivers/mtd/devices/Makefile

@@ -3,8 +3,6 @@
 #
 # $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
 
-O_TARGET	:= devlink.o
-
 #                       *** BIG UGLY NOTE ***
 #
 # The removal of get_module_symbol() and replacement with

drivers/mtd/maps/Makefile

@@ -3,8 +3,6 @@
 #
 # $Id: Makefile,v 1.13 2001/08/16 15:16:58 rmk Exp $
 
-O_TARGET	:= mapslink.o
-
 # Chip mappings
 obj-$(CONFIG_MTD_CDB89712)      += cdb89712.o
 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o

drivers/mtd/nand/Makefile

@@ -3,8 +3,6 @@
 #
 # $Id: Makefile,v 1.5 2001/09/19 22:39:59 dwmw2 Exp $
 
-O_TARGET	:= nandlink.o
-
 export-objs	:= nand.o nand_ecc.o
 
 nandobjs-y			:= nand.o

drivers/net/Makefile

-# File: drivers/net/Makefile
 #
 # Makefile for the Linux network (ethercard) device drivers.
 #
 
-obj-y           :=
-obj-m           :=
-obj-n           :=
-obj-            :=
-
 mod-subdirs     := appletalk arcnet fc irda tokenring tulip pcmcia wireless \
 		   wan ../acorn/net
 
-O_TARGET := net.o
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/parport/Makefile

 #
 # Makefile for the kernel Parallel port device drivers.
 #
-# Note! Parport is the Borg.  We have assimilated some other
-# drivers in the `char', `net' and `scsi' directories,
-# but left them there to allay suspicion.
-#
-# 7 October 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>
-# Rewritten to use lists instead of if-statements.
-#
-
-O_TARGET := driver.o
 
 export-objs	:= init.o parport_pc.o
 

drivers/pci/Makefile

 #
 # Makefile for the PCI bus specific drivers.
 #
-# 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 inherited from the
-# parent makefile.
-#
-
-O_TARGET := driver.o
 
 export-objs := access.o hotplug.o pci-driver.o pci.o pool.o probe.o proc.o search.o
 

drivers/pcmcia/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
 #
 
-O_TARGET := pcmcia.o
-
 export-objs := ds.o cs.o yenta.o pci_socket.o
 
 obj-$(CONFIG_PCMCIA)			+= pcmcia_core.o ds.o

drivers/pnp/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the kernel Plug-and-Play device drivers.
 #
 
-O_TARGET := pnp.o
-
 export-objs := isapnp.o pnpbios_core.o
 
 isa-pnp-proc-$(CONFIG_PROC_FS) = isapnp_proc.o

drivers/s390/Makefile

@@ -2,14 +2,11 @@
 # Makefile for the S/390 specific device drivers
 #
 
-O_TARGET := io.o
+mod-subdirs := block char misc net
 
-subdir-y := block char misc net
-subdir-m := $(subdir-y)
-
-obj-y := s390io.o s390mach.o s390dyn.o idals.o ccwcache.o
 export-objs += ccwcache.o idals.o s390dyn.o s390io.o
 
-obj-y += $(foreach dir,$(subdir-y),$(dir)/s390-$(dir).o)
+obj-y += s390io.o s390mach.o s390dyn.o idals.o ccwcache.o
+obj-y += block/ char/ misc/ net/
 
 include $(TOPDIR)/Rules.make

drivers/s390/block/Makefile

@@ -2,8 +2,6 @@
 # S/390 block devices
 #
 
-O_TARGET := s390-block.o
-
 export-objs := dasd.o
 
 dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o

drivers/s390/char/Makefile

@@ -2,8 +2,6 @@
 # S/390 character devices
 #
 
-O_TARGET := s390-char.o
-
 export-objs	:= hwc_rw.o
 
 tub3270-objs := tuball.o tubfs.o tubtty.o \

drivers/s390/misc/Makefile

@@ -2,8 +2,6 @@
 # S/390 miscellaneous devices
 #
 
-O_TARGET := s390-misc.o
-
 obj-$(CONFIG_CHANDEV) += chandev.o
 export-objs += chandev.o
 

drivers/s390/net/Makefile

@@ -2,8 +2,6 @@
 # S/390 network devices
 #
 
-O_TARGET := s390-net.o
-
 export-objs := iucv.o fsm.o
 
 ctc-objs := ctcmain.o ctctty.o

drivers/sbus/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...
 
-O_TARGET := sbus_all.o
 ifneq ($(ARCH),m68k)
 obj-y    := sbus.o dvma.o
 endif
 
-subdir-y += char
-subdir-m += char
-obj-$(CONFIG_SBUSCHAR) += char/sunchar.o
-
-subdir-y += audio
-subdir-m += audio
+mod-subdirs := char audio
 
-# This is grotty but works around some problems with modules.
-ifeq ($(CONFIG_SPARCAUDIO),y)
-obj-y += audio/sparcaudio.o
-endif
+obj-$(CONFIG_SBUSCHAR) += char/
+obj-$(CONFIG_SPARCAUDIO) += audio/
 
 include $(TOPDIR)/Rules.make

drivers/sbus/audio/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := sparcaudio.o
-
 export-objs	:= audio.o amd7930.o dbri.o
 
 obj-$(CONFIG_SPARCAUDIO)		+= audio.o

drivers/sbus/char/Makefile

@@ -7,8 +7,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := sunchar.o
-
 export-objs := su.o bbc_i2c.o
 obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
 

drivers/scsi/Makefile

@@ -18,9 +18,6 @@ CFLAGS_aha152x.o =   -DAHA152X_STAT -DAUTOCONF
 CFLAGS_gdth.o    = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
 CFLAGS_seagate.o =   -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
 
-
-O_TARGET := scsidrv.o
-
 export-objs	:= scsi_syms.o 53c700.o
 mod-subdirs	:= pcmcia ../acorn/scsi
 

drivers/sgi/Makefile

@@ -5,8 +5,8 @@
 #
 # Character and Audio devices for SGI machines.
 #
-subdir-y	+= char
 subdir-m	+= char
-obj-y		+= char/sgichar.o
+
+obj-y		+= char/
 
 include $(TOPDIR)/Rules.make

drivers/sgi/char/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...
-
-O_TARGET := sgichar.o
 
 export-objs	:= newport.o shmiq.o sgicons.o usema.o
 obj-y		:= newport.o shmiq.o sgicons.o usema.o streamable.o

drivers/telephony/Makefile

 #
 # Makefile for drivers/telephony
 #
-# 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).
-#
 
-obj-y   :=
-obj-n   :=
-obj-m   :=
-obj-    :=
 export-objs := phonedev.o ixj.o
 
 obj-$(CONFIG_PHONE) += phonedev.o
 obj-$(CONFIG_PHONE_IXJ) += ixj.o
 obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o
 
-O_TARGET := telephony.o
-
 include $(TOPDIR)/Rules.make
 

drivers/usb/Makefile

@@ -2,65 +2,61 @@
 # Makefile for the kernel USB device drivers.
 #
 
-O_TARGET	:= usbdrv.o
-
 # Object files in subdirectories
 mod-subdirs	:= serial
 
-subdir-$(CONFIG_USB)		+= core
-
-subdir-$(CONFIG_USB_EHCI_HCD)		+= host
-subdir-$(CONFIG_USB_OHCI_HCD)		+= host
-subdir-$(CONFIG_USB_OHCI)		+= host
-subdir-$(CONFIG_USB_UHCI_ALT)		+= host
-subdir-$(CONFIG_USB_UHCI_HCD_ALT)	+= host
-subdir-$(CONFIG_USB_UHCI_HCD)		+= host
-subdir-$(CONFIG_USB_UHCI)		+= host
-
-subdir-$(CONFIG_USB_ACM)		+= class
-subdir-$(CONFIG_USB_AUDIO)		+= class
-subdir-$(CONFIG_USB_BLUETOOTH_TTY)	+= class
-subdir-$(CONFIG_USB_PRINTER)		+= class
-
-subdir-$(CONFIG_USB_STORAGE)	+= storage
-
-subdir-$(CONFIG_USB_HID)	+= input
-subdir-$(CONFIG_USB_KBD)	+= input
-subdir-$(CONFIG_USB_MOUSE)	+= input
-subdir-$(CONFIG_USB_WACOM)	+= input
-
-subdir-$(CONFIG_USB_DABUSB)	+= media
-subdir-$(CONFIG_USB_DSBR)	+= media
-subdir-$(CONFIG_USB_IBMCAM)	+= media
-subdir-$(CONFIG_USB_KONICAWC)	+= media
-subdir-$(CONFIG_USB_OV511)	+= media
-subdir-$(CONFIG_USB_PWC)	+= media
-subdir-$(CONFIG_USB_SE401)	+= media
-subdir-$(CONFIG_USB_STV680)	+= media
-subdir-$(CONFIG_USB_VICAM)	+= media
-
-subdir-$(CONFIG_USB_CATC)	+= net
-subdir-$(CONFIG_USB_CDCETHER)	+= net
-subdir-$(CONFIG_USB_KAWETH)	+= net
-subdir-$(CONFIG_USB_PEGASUS)	+= net
-subdir-$(CONFIG_USB_RTL8150)	+= net
-subdir-$(CONFIG_USB_USBNET)	+= net
-
-subdir-$(CONFIG_USB_DC2XX)	+= image
-subdir-$(CONFIG_USB_HPUSBSCSI)	+= image
-subdir-$(CONFIG_USB_MDC800)	+= image
-subdir-$(CONFIG_USB_MICROTEK)	+= image
-subdir-$(CONFIG_USB_SCANNER)	+= image
-
-subdir-$(CONFIG_USB_SERIAL)	+= serial
-
-subdir-$(CONFIG_USB_AUERSWALD)	+= misc
-subdir-$(CONFIG_USB_BRLVGER)	+= misc
-subdir-$(CONFIG_USB_EMI26)	+= misc
-subdir-$(CONFIG_USB_RIO500)	+= misc
-subdir-$(CONFIG_USB_TIGL)	+= misc
-subdir-$(CONFIG_USB_USS720)	+= misc
-
-obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
+obj-$(CONFIG_USB)		+= core/
+
+obj-$(CONFIG_USB_EHCI_HCD)	+= host/
+obj-$(CONFIG_USB_OHCI_HCD)	+= host/
+obj-$(CONFIG_USB_OHCI)		+= host/
+obj-$(CONFIG_USB_UHCI_ALT)	+= host/
+obj-$(CONFIG_USB_UHCI_HCD_ALT)	+= host/
+obj-$(CONFIG_USB_UHCI_HCD)	+= host/
+obj-$(CONFIG_USB_UHCI)		+= host/
+
+obj-$(CONFIG_USB_ACM)		+= class/
+obj-$(CONFIG_USB_AUDIO)		+= class/
+obj-$(CONFIG_USB_BLUETOOTH_TTY)	+= class/
+obj-$(CONFIG_USB_PRINTER)	+= class/
+
+obj-$(CONFIG_USB_STORAGE)	+= storage/
+
+obj-$(CONFIG_USB_HID)		+= input/
+obj-$(CONFIG_USB_KBD)		+= input/
+obj-$(CONFIG_USB_MOUSE)		+= input/
+obj-$(CONFIG_USB_WACOM)		+= input/
+
+obj-$(CONFIG_USB_DABUSB)	+= media/
+obj-$(CONFIG_USB_DSBR)		+= media/
+obj-$(CONFIG_USB_IBMCAM)	+= media/
+obj-$(CONFIG_USB_KONICAWC)	+= media/
+obj-$(CONFIG_USB_OV511)		+= media/
+obj-$(CONFIG_USB_PWC)		+= media/
+obj-$(CONFIG_USB_SE401)		+= media/
+obj-$(CONFIG_USB_STV680)	+= media/
+obj-$(CONFIG_USB_VICAM)		+= media/
+
+obj-$(CONFIG_USB_CATC)		+= net/
+obj-$(CONFIG_USB_CDCETHER)	+= net/
+obj-$(CONFIG_USB_KAWETH)	+= net/
+obj-$(CONFIG_USB_PEGASUS)	+= net/
+obj-$(CONFIG_USB_RTL8150)	+= net/
+obj-$(CONFIG_USB_USBNET)	+= net/
+
+obj-$(CONFIG_USB_DC2XX)		+= image/
+obj-$(CONFIG_USB_HPUSBSCSI)	+= image/
+obj-$(CONFIG_USB_MDC800)	+= image/
+obj-$(CONFIG_USB_MICROTEK)	+= image/
+obj-$(CONFIG_USB_SCANNER)	+= image/
+
+obj-$(CONFIG_USB_SERIAL)	+= serial/
+
+obj-$(CONFIG_USB_AUERSWALD)	+= misc/
+obj-$(CONFIG_USB_BRLVGER)	+= misc/
+obj-$(CONFIG_USB_EMI26)		+= misc/
+obj-$(CONFIG_USB_RIO500)	+= misc/
+obj-$(CONFIG_USB_TIGL)		+= misc/
+obj-$(CONFIG_USB_USS720)	+= misc/
 
 include $(TOPDIR)/Rules.make

drivers/usb/class/Makefile

@@ -3,8 +3,6 @@
 # (one step up from the misc category)
 #
 
-O_TARGET	:= class.o
-
 obj-$(CONFIG_USB_ACM)		+= cdc-acm.o
 obj-$(CONFIG_USB_AUDIO)		+= audio.o
 obj-$(CONFIG_USB_BLUETOOTH_TTY)	+= bluetty.o

drivers/usb/core/Makefile

@@ -2,8 +2,6 @@
 # Makefile for USB Core files and filesystem
 #
 
-O_TARGET	:= core.o
-
 export-objs	:= usb.o hcd.o
 
 usbcore-objs	:= usb.o usb-debug.o hub.o hcd.o

drivers/usb/host/Makefile

@@ -3,8 +3,6 @@
 # framework and drivers
 #
 
-O_TARGET	:= host.o
-
 obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)	+= ohci-hcd.o
 obj-$(CONFIG_USB_UHCI_HCD)	+= usb-uhci-hcd.o

drivers/usb/image/Makefile

@@ -2,8 +2,6 @@
 # Makefile for USB Image drivers
 #
 
-O_TARGET	:= image.o
-
 obj-$(CONFIG_USB_MDC800)	+= mdc800.o
 obj-$(CONFIG_USB_HPUSBSCSI)	+= hpusbscsi.o
 obj-$(CONFIG_USB_MICROTEK)	+= microtek.o

drivers/usb/input/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the USB input drivers
 #
 
-O_TARGET	:= input.o
-
 # Multipart objects.
 hid-objs	:= hid-core.o
 

drivers/usb/media/Makefile

@@ -2,8 +2,6 @@
 # Makefile for USB Media drivers
 #
 
-O_TARGET	:= media.o
-
 export-objs	:= ov511.o pwc-uncompress.o usbvideo.o
 
 pwc-objs	:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o

drivers/usb/misc/Makefile

@@ -3,8 +3,6 @@
 # (the ones that don't fit into any other categories)
 #
 
-O_TARGET	:= misc.o
-
 obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o
 obj-$(CONFIG_USB_BRLVGER)	+= brlvger.o
 obj-$(CONFIG_USB_EMI26)		+= emi26.o

drivers/usb/net/Makefile

@@ -2,8 +2,6 @@
 # Makefile for USB Network drivers
 #
 
-O_TARGET	:= net.o
-
 obj-$(CONFIG_USB_CATC)		+= catc.o
 obj-$(CONFIG_USB_CDCETHER)	+= cdc-ether.o
 obj-$(CONFIG_USB_KAWETH)	+= kaweth.o

drivers/usb/serial/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the USB serial device drivers.
 #
 
-O_TARGET	:= serial.o
-
 # Object file lists.
 
 obj-$(CONFIG_USB_SERIAL)                        += usbserial.o

drivers/usb/storage/Makefile

@@ -5,7 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET	:= storage.o
 EXTRA_CFLAGS	:= -I../../scsi/
 
 obj-$(CONFIG_USB_STORAGE)	+= usb-storage.o

drivers/video/Makefile

@@ -2,8 +2,6 @@
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
 # Rewritten to use lists instead of if-statements.
 
-O_TARGET := video.o
-
 mod-subdirs	:= matrox
 
 # All of the (potential) objects that export symbols.

drivers/zorro/Makefile

 #
 # Makefile for the Zorro bus specific drivers.
 #
-# 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 inherited from the
-# parent makefile.
-#
-
-O_TARGET := driver.o
 
 export-objs		:= zorro.o
 

init/Makefile

@@ -12,6 +12,10 @@ include $(TOPDIR)/Rules.make
 
 version.o: ../include/linux/compile.h
 
+# 'make dep' may add a dependency on $(TOPDIR)/include/linux/compile.h
+
+$(TOPDIR)/include/linux/compile.h: ../include/linux/compile.h ;
+
 # compile.h changes depending on hostname, generation number, etc,
 # so we regenerate it always.
 # mkcompile_h will make sure to only update the

kernel/suspend.c

@@ -49,7 +49,6 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/version.h>
-#include <linux/compile.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/init.h>