Merge http://linus.bkbits.net/linux-2.5

into hostme.bitkeeper.com:/ua/repos/l/linux-isdn/linux-2.5.make

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
+EXTRA_TARGETS	:= head.o
 
 EXTRA_AFLAGS	:= $(CFLAGS)
 
@@ -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/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
-
-include $(TOPDIR)/Rules.make
+EXTRA_TARGETS 		:= head.o
 
 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
+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
+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
-
-all: sn1.a
+O_TARGET := sn1.a
 
-O_TARGET        = sn1.a
+obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
 
-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
+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
 
-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
-
-all: ip32-kern.a ip32-irq-glue.o
+EXTRA_TARGETS	:= 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
 
-ifdef CONFIG_PCI
-obj-y   += ip32-pci.o ip32-pci-dma.o
-endif
+obj-$(CONFIG_PCI) += ip32-pci.o ip32-pci-dma.o
+
+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 \
+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 \
@@ -20,7 +15,6 @@ obj-y		+= cache.o setup.o traps.o time.o irq.o \
 
 export-objs	:= parisc_ksyms.o
 
-
 obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_VT) += keyboard.o
 obj-$(CONFIG_PCI_LBA) += lba_pci.o

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
+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
+EXTRA_TARGETS	:= $(KHEAD)
 
 export-objs         := ppc_ksyms.o setup.o
 

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
+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/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
+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
+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
+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
-
+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
 

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>