summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMatt Mooney <mfm@muteddisk.com>2010-08-05 11:23:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 13:21:23 -0700
commit2f5a2f81843ccef626c3db30aa19ed5abf8f0181 (patch)
treea2c88f40a85025472d8adc6db97eb41dd45a7cdc /Documentation
parent4f8272802739f5c6ce6b0a548810a181d2f1b652 (diff)
downloadlinux-3.10-2f5a2f81843ccef626c3db30aa19ed5abf8f0181.tar.gz
linux-3.10-2f5a2f81843ccef626c3db30aa19ed5abf8f0181.tar.bz2
linux-3.10-2f5a2f81843ccef626c3db30aa19ed5abf8f0181.zip
Documentation: update kbuild make examples#2 to reflect changes
Update section 3.2 and 3.5 example, along with text in section 3.5 to reflect change. Signed-off-by: matt mooney <mfm@muteddisk.com> Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kbuild/makefiles.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index f29dca374aa..d77e24e0055 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -168,7 +168,7 @@ more details, with real examples.
#drivers/isdn/i4l/Makefile
# Makefile for the kernel ISDN subsystem and device drivers.
# Each configuration option enables a list of files.
- obj-$(CONFIG_ISDN) += isdn.o
+ obj-$(CONFIG_ISDN_I4L) += isdn.o
obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
--- 3.3 Loadable module goals - obj-m
@@ -245,12 +245,12 @@ more details, with real examples.
may contain both a built-in.o and a lib.a file.
Example:
- #arch/i386/lib/Makefile
- lib-y := checksum.o delay.o
+ #arch/x86/lib/Makefile
+ lib-y := delay.o
- This will create a library lib.a based on checksum.o and delay.o.
- For kbuild to actually recognize that there is a lib.a being built,
- the directory shall be listed in libs-y.
+ This will create a library lib.a based on delay.o. For kbuild to
+ actually recognize that there is a lib.a being built, the directory
+ shall be listed in libs-y.
See also "6.3 List directories to visit when descending".
Use of lib-y is normally restricted to lib/ and arch/*/lib.