Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:45:34 +0000 (13:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:45:34 +0000 (13:45 -0800)
1  2 
Makefile

diff --combined Makefile
index ea96da1572d595de19daeda44b2364416e9bd3a0,83a3185670f1dd9b7e7a6520b68fd66dbdefc01b..6d1f727f43999f81ddd08088625b977d39e1b76e
+++ b/Makefile
@@@ -347,7 -347,7 +347,7 @@@ AFLAGS_KERNEL      
  # Needed to be compatible with the O= option
  LINUXINCLUDE    := -Iinclude \
                     $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
-                  -imacros include/linux/autoconf.h
+                  -include include/linux/autoconf.h
  
  CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
@@@ -407,7 -407,7 +407,7 @@@ outputmakefile
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
-                        cscope TAGS tags help %docs check%
+                        cscope TAGS tags help %docs check% kernelrelease
  
  config-targets := 0
  mixed-targets  := 0
@@@ -583,7 -583,7 +583,7 @@@ export MODLI
  
  
  ifeq ($(KBUILD_EXTMOD),)
 -core-y                += kernel/ mm/ fs/ ipc/ security/ crypto/
 +core-y                += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \