diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /Makefile | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 19 | 3 | SUBLEVEL = 19 |
| 4 | EXTRAVERSION =-rc2 | 4 | EXTRAVERSION = |
| 5 | NAME=Avast! A bilge rat! | 5 | NAME=Avast! A bilge rat! |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -10,8 +10,11 @@ NAME=Avast! A bilge rat! | |||
| 10 | # Comments in this file are targeted only to the developer, do not | 10 | # Comments in this file are targeted only to the developer, do not |
| 11 | # expect to learn how to build the kernel reading this file. | 11 | # expect to learn how to build the kernel reading this file. |
| 12 | 12 | ||
| 13 | # Do not print "Entering directory ..." | 13 | # Do not: |
| 14 | MAKEFLAGS += --no-print-directory | 14 | # o use make's built-in rules and variables |
| 15 | # (this increases performance and avoid hard-to-debug behavour); | ||
| 16 | # o print "Entering directory ..."; | ||
| 17 | MAKEFLAGS += -rR --no-print-directory | ||
| 15 | 18 | ||
| 16 | # We are using a recursive build, so we need to do a little thinking | 19 | # We are using a recursive build, so we need to do a little thinking |
| 17 | # to get the ordering right. | 20 | # to get the ordering right. |
| @@ -271,12 +274,8 @@ export quiet Q KBUILD_VERBOSE | |||
| 271 | # Look for make include files relative to root of kernel src | 274 | # Look for make include files relative to root of kernel src |
| 272 | MAKEFLAGS += --include-dir=$(srctree) | 275 | MAKEFLAGS += --include-dir=$(srctree) |
| 273 | 276 | ||
| 274 | # We need some generic definitions | 277 | # We need some generic definitions. |
| 275 | include $(srctree)/scripts/Kbuild.include | 278 | include $(srctree)/scripts/Kbuild.include |
| 276 | |||
| 277 | # Do not use make's built-in rules and variables | ||
| 278 | # This increases performance and avoid hard-to-debug behavour | ||
| 279 | MAKEFLAGS += -rR | ||
| 280 | 279 | ||
| 281 | # Make variables (CC, etc...) | 280 | # Make variables (CC, etc...) |
| 282 | 281 | ||
| @@ -499,6 +498,7 @@ endif | |||
| 499 | 498 | ||
| 500 | ifdef CONFIG_UNWIND_INFO | 499 | ifdef CONFIG_UNWIND_INFO |
| 501 | CFLAGS += -fasynchronous-unwind-tables | 500 | CFLAGS += -fasynchronous-unwind-tables |
| 501 | LDFLAGS_vmlinux += --eh-frame-hdr | ||
| 502 | endif | 502 | endif |
| 503 | 503 | ||
| 504 | ifdef CONFIG_DEBUG_INFO | 504 | ifdef CONFIG_DEBUG_INFO |
| @@ -1319,7 +1319,8 @@ define xtags | |||
| 1319 | $(all-sources) | xargs $1 -a \ | 1319 | $(all-sources) | xargs $1 -a \ |
| 1320 | -I __initdata,__exitdata,__acquires,__releases \ | 1320 | -I __initdata,__exitdata,__acquires,__releases \ |
| 1321 | -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \ | 1321 | -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \ |
| 1322 | --extra=+f --c-kinds=+px; \ | 1322 | --extra=+f --c-kinds=+px \ |
| 1323 | --regex-asm='/ENTRY\(([^)]*)\).*/\1/'; \ | ||
| 1323 | $(all-kconfigs) | xargs $1 -a \ | 1324 | $(all-kconfigs) | xargs $1 -a \ |
| 1324 | --langdef=kconfig \ | 1325 | --langdef=kconfig \ |
| 1325 | --language-force=kconfig \ | 1326 | --language-force=kconfig \ |
| @@ -1482,6 +1483,8 @@ endif # skip-makefile | |||
| 1482 | PHONY += FORCE | 1483 | PHONY += FORCE |
| 1483 | FORCE: | 1484 | FORCE: |
| 1484 | 1485 | ||
| 1486 | # Cancel implicit rules on top Makefile, `-rR' will apply to sub-makes. | ||
| 1487 | Makefile: ; | ||
| 1485 | 1488 | ||
| 1486 | # Declare the contents of the .PHONY variable as phony. We keep that | 1489 | # Declare the contents of the .PHONY variable as phony. We keep that |
| 1487 | # information in a variable se we can use it in if_changed and friends. | 1490 | # information in a variable se we can use it in if_changed and friends. |