From 2e01de1181229862af29caa76f1be2211d01466b Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Fri, 10 Mar 2006 00:23:32 +0100 Subject: [PATCH] --- yaml --- r: 23731 b: refs/heads/master c: 172c3ae3e686f548a0eba950405e5cc321460005 h: refs/heads/master i: 23729: 4948fe627ec0077036ab0ffa8f63ea29f978ea6e 23727: fa09bfb79a4a42a5a923380ff37a68fb9759d2ca v: v3 --- [refs] | 2 +- trunk/Documentation/kbuild/makefiles.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f54fcea38314..92ceaa5e10ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0131705d589e2341dbc5e8946a60f83d8c1773dc +refs/heads/master: 172c3ae3e686f548a0eba950405e5cc321460005 diff --git a/trunk/Documentation/kbuild/makefiles.txt b/trunk/Documentation/kbuild/makefiles.txt index 99d51a5bb0d9..a9c00facdf40 100644 --- a/trunk/Documentation/kbuild/makefiles.txt +++ b/trunk/Documentation/kbuild/makefiles.txt @@ -106,9 +106,9 @@ This document is aimed towards normal developers and arch developers. Most Makefiles within the kernel are kbuild Makefiles that use the kbuild infrastructure. This chapter introduce the syntax used in the kbuild makefiles. -The preferred name for the kbuild files is 'Kbuild' but 'Makefile' will -continue to be supported. All new developmen is expected to use the -Kbuild filename. +The preferred name for the kbuild files are 'Makefile' but 'Kbuild' can +be used and if both a 'Makefile' and a 'Kbuild' file exists then the 'Kbuild' +file will be used. Section 3.1 "Goal definitions" is a quick intro, further chapters provide more details, with real examples.