This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index effcf26..e316aca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 10
-EXTRAVERSION = -1.14_FC2.1.planetlab
+SUBLEVEL = 9
+EXTRAVERSION = -1.11_FC2.1.planetlab
 NAME=AC 1
 
 # *DOCUMENTATION*
@@ -156,8 +156,8 @@ localversion-files := $(wildcard $(objtree)/localversion* $(srctree)/localversio
 endif
 
 LOCALVERSION = $(subst $(space),, \
-              $(shell cat /dev/null $(localversion-files:%~=)) \
-              $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
+              $(shell cat /dev/null $(localversion-files)) \
+              $(subst ",,$(CONFIG_LOCALVERSION)))
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
 
@@ -295,11 +295,6 @@ check_gcc = $(warning check_gcc is deprecated - use cc-option) \
 cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
                 > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 
-# cc-option-align
-# Prefix align with either -falign or -malign
-cc-option-align = $(subst -functions=0,,\
-       $(call cc-option,-falign-functions=0,-malign-functions=0))
-
 # cc-version
 # Usage gcc-ver := $(call cc-version $(CC))
 cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
@@ -384,18 +379,6 @@ RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CV
 scripts_basic:
        $(Q)$(MAKE) $(build)=scripts/basic
 
-.PHONY: outputmakefile
-# outputmakefile generate a Makefile to be placed in output directory, if
-# using a seperate output directory. This allows convinient use
-# of make in output directory
-outputmakefile:
-       $(Q)if /usr/bin/env test ! $(srctree) -ef $(objtree); then \
-       $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile              \
-           $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)         \
-           > $(objtree)/Makefile;                                 \
-           echo '  GEN    $(objtree)/Makefile';                   \
-       fi
-
 # To make sure we do not include .config for any of the *config targets
 # catch them early, and hand them over to scripts/kconfig/Makefile
 # It is allowed to specify more targets when calling make, including
@@ -440,15 +423,9 @@ ifeq ($(config-targets),1)
 # *config targets only - make sure prerequisites are updated, and descend
 # in scripts/kconfig to make the *config target
 
-# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.
-# KBUILD_DEFCONFIG may point out an alternative default configuration
-# used for 'make defconfig'
-include $(srctree)/arch/$(ARCH)/Makefile
-export KBUILD_DEFCONFIG
-
-config: scripts_basic outputmakefile FORCE
+config: scripts_basic FORCE
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
-%config: scripts_basic outputmakefile FORCE
+%config: scripts_basic FORCE
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
 
 else
@@ -509,16 +486,7 @@ else
 CFLAGS         += -O2
 endif
 
-#Add align options if CONFIG_CC_* is not equal to 0
-add-align = $(if $(filter-out 0,$($(1))),$(cc-option-align)$(2)=$($(1)))
-CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_FUNCTIONS,-functions)
-CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_LABELS,-labels)
-CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
-CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
-
-ifdef CONFIG_FRAME_POINTER
-CFLAGS         += -fno-omit-frame-pointer
-else
+ifndef CONFIG_FRAME_POINTER
 CFLAGS         += -fomit-frame-pointer
 endif
 
@@ -530,11 +498,11 @@ ifdef CONFIG_DEBUG_INFO
 CFLAGS         += -g
 endif
 
-include $(srctree)/arch/$(ARCH)/Makefile
-
 # warn about C99 declaration after statement
 CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
 
+include $(srctree)/arch/$(ARCH)/Makefile
+
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the commandline or
 # set in the environment
@@ -747,12 +715,22 @@ $(vmlinux-dirs): prepare-all scripts
 
 .PHONY: prepare-all prepare prepare0 prepare1 prepare2
 
-# prepare2 is used to check if we are building in a separate output directory,
+# prepare 2 generate Makefile to be placed in output directory, if
+# using a seperate output directory. This allows convinient use
+# of make in output directory
+prepare2:
+       $(Q)if /usr/bin/env test ! $(srctree) -ef $(objtree); then \
+       $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile              \
+           $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)         \
+           > $(objtree)/Makefile;                                 \
+       fi
+
+# prepare1 is used to check if we are building in a separate output directory,
 # and if so do:
 # 1) Check that make has not been executed in the kernel src $(srctree)
 # 2) Create the include2 directory, used for the second asm symlink
 
-prepare2:
+prepare1: prepare2
 ifneq ($(KBUILD_SRC),)
        @echo '  Using $(srctree) as source for kernel'
        $(Q)if [ -h $(srctree)/include/asm -o -f $(srctree)/.config ]; then \
@@ -764,9 +742,6 @@ ifneq ($(KBUILD_SRC),)
        $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
 endif
 
-# prepare1 creates a makefile if using a separate output directory
-prepare1: prepare2 outputmakefile
-
 prepare0: prepare1 include/linux/version.h include/asm include/config/MARKER
 ifneq ($(KBUILD_MODULES),)
        $(Q)rm -rf $(MODVERDIR)