aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kbuild/makefiles.txt
diff options
context:
space:
mode:
authorMatt Mooney <mfm@muteddisk.com>2010-08-05 14:23:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 16:21:23 -0400
commit2f5a2f81843ccef626c3db30aa19ed5abf8f0181 (patch)
treea2c88f40a85025472d8adc6db97eb41dd45a7cdc /Documentation/kbuild/makefiles.txt
parent4f8272802739f5c6ce6b0a548810a181d2f1b652 (diff)
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/kbuild/makefiles.txt')
-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 f29dca374aa2..d77e24e0055d 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -168,7 +168,7 @@ more details, with real examples.
168 #drivers/isdn/i4l/Makefile 168 #drivers/isdn/i4l/Makefile
169 # Makefile for the kernel ISDN subsystem and device drivers. 169 # Makefile for the kernel ISDN subsystem and device drivers.
170 # Each configuration option enables a list of files. 170 # Each configuration option enables a list of files.
171 obj-$(CONFIG_ISDN) += isdn.o 171 obj-$(CONFIG_ISDN_I4L) += isdn.o
172 obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o 172 obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
173 173
174--- 3.3 Loadable module goals - obj-m 174--- 3.3 Loadable module goals - obj-m
@@ -245,12 +245,12 @@ more details, with real examples.
245 may contain both a built-in.o and a lib.a file. 245 may contain both a built-in.o and a lib.a file.
246 246
247 Example: 247 Example:
248 #arch/i386/lib/Makefile 248 #arch/x86/lib/Makefile
249 lib-y := checksum.o delay.o 249 lib-y := delay.o
250 250
251 This will create a library lib.a based on checksum.o and delay.o. 251 This will create a library lib.a based on delay.o. For kbuild to
252 For kbuild to actually recognize that there is a lib.a being built, 252 actually recognize that there is a lib.a being built, the directory
253 the directory shall be listed in libs-y. 253 shall be listed in libs-y.
254 See also "6.3 List directories to visit when descending". 254 See also "6.3 List directories to visit when descending".
255 255
256 Use of lib-y is normally restricted to lib/ and arch/*/lib. 256 Use of lib-y is normally restricted to lib/ and arch/*/lib.