diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:21:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:21:57 -0400 |
| commit | 15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch) | |
| tree | 7fa2f81c33c9efcb1a1568385beead75c5892cfb | |
| parent | 6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff) | |
| parent | 11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
kconfig: fix mconf segmentation fault
kbuild: enable use of code from a different dir
kconfig: error out if recursive dependencies are found
kbuild: scripts/basic/fixdep segfault on pathological string-o-death
kconfig: correct minor typo in Kconfig warning message.
kconfig: fix path to modules.txt in Kconfig help
usr/Kconfig: fix typo
kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
kbuild: be more explicit on missing .config file
kbuild: clarify the creation of the LOCALVERSION_AUTO string.
kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
kconfig: refer to qt3 if we cannot find qt libraries
kbuild: handle compressed cpio initramfs-es
kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
kbuild: remove stale comment in modpost.c
kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
kbuild: fix make mrproper for Documentation/DocBook/man
kbuild: remove kconfig binaries during make mrproper
kconfig/menuconfig: do not hardcode '.config'
kbuild: override build timestamp & version
...
47 files changed, 766 insertions, 168 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 867608ab3ca0..10b5cd6c54a0 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile | |||
| @@ -41,7 +41,7 @@ psdocs: $(PS) | |||
| 41 | PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) | 41 | PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) |
| 42 | pdfdocs: $(PDF) | 42 | pdfdocs: $(PDF) |
| 43 | 43 | ||
| 44 | HTML := $(patsubst %.xml, %.html, $(BOOKS)) | 44 | HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS))) |
| 45 | htmldocs: $(HTML) | 45 | htmldocs: $(HTML) |
| 46 | 46 | ||
| 47 | MAN := $(patsubst %.xml, %.9, $(BOOKS)) | 47 | MAN := $(patsubst %.xml, %.9, $(BOOKS)) |
| @@ -152,6 +152,7 @@ quiet_cmd_db2man = MAN $@ | |||
| 152 | @(which xmlto > /dev/null 2>&1) || \ | 152 | @(which xmlto > /dev/null 2>&1) || \ |
| 153 | (echo "*** You need to install xmlto ***"; \ | 153 | (echo "*** You need to install xmlto ***"; \ |
| 154 | exit 1) | 154 | exit 1) |
| 155 | $(Q)mkdir -p $(obj)/man | ||
| 155 | $(call cmd,db2man) | 156 | $(call cmd,db2man) |
| 156 | @touch $@ | 157 | @touch $@ |
| 157 | 158 | ||
| @@ -212,11 +213,7 @@ clean-files := $(DOCBOOKS) \ | |||
| 212 | $(patsubst %.xml, %.9, $(DOCBOOKS)) \ | 213 | $(patsubst %.xml, %.9, $(DOCBOOKS)) \ |
| 213 | $(C-procfs-example) | 214 | $(C-procfs-example) |
| 214 | 215 | ||
| 215 | clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) | 216 | clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man |
| 216 | |||
| 217 | #man put files in man subdir - traverse down | ||
| 218 | subdir- := man/ | ||
| 219 | |||
| 220 | 217 | ||
| 221 | # Declare the contents of the .PHONY variable as phony. We keep that | 218 | # Declare the contents of the .PHONY variable as phony. We keep that |
| 222 | # information in a variable se we can use it in if_changed and friends. | 219 | # information in a variable se we can use it in if_changed and friends. |
diff --git a/Documentation/DocBook/man/Makefile b/Documentation/DocBook/man/Makefile deleted file mode 100644 index 4fb7ea0f7ac8..000000000000 --- a/Documentation/DocBook/man/Makefile +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | # Rules are put in Documentation/DocBook | ||
| 2 | |||
| 3 | clean-files := *.9.gz *.sgml manpage.links manpage.refs | ||
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt index 769ee05ee4d1..1d247d59ad56 100644 --- a/Documentation/kbuild/modules.txt +++ b/Documentation/kbuild/modules.txt | |||
| @@ -249,7 +249,7 @@ following files: | |||
| 249 | --> filename: Makefile | 249 | --> filename: Makefile |
| 250 | KERNELDIR := /lib/modules/`uname -r`/build | 250 | KERNELDIR := /lib/modules/`uname -r`/build |
| 251 | all:: | 251 | all:: |
| 252 | $(MAKE) -C $KERNELDIR M=`pwd` $@ | 252 | $(MAKE) -C $(KERNELDIR) M=`pwd` $@ |
| 253 | 253 | ||
| 254 | # Module specific targets | 254 | # Module specific targets |
| 255 | genbin: | 255 | genbin: |
| @@ -2,6 +2,7 @@ | |||
| 2 | # Kbuild for top-level directory of the kernel | 2 | # Kbuild for top-level directory of the kernel |
| 3 | # This file takes care of the following: | 3 | # This file takes care of the following: |
| 4 | # 1) Generate asm-offsets.h | 4 | # 1) Generate asm-offsets.h |
| 5 | # 2) Check for missing system calls | ||
| 5 | 6 | ||
| 6 | ##### | 7 | ##### |
| 7 | # 1) Generate asm-offsets.h | 8 | # 1) Generate asm-offsets.h |
| @@ -46,3 +47,13 @@ $(obj)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild | |||
| 46 | $(Q)mkdir -p $(dir $@) | 47 | $(Q)mkdir -p $(dir $@) |
| 47 | $(call cmd,offsets) | 48 | $(call cmd,offsets) |
| 48 | 49 | ||
| 50 | ##### | ||
| 51 | # 2) Check for missing system calls | ||
| 52 | # | ||
| 53 | |||
| 54 | quiet_cmd_syscalls = CALL $< | ||
| 55 | cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) | ||
| 56 | |||
| 57 | PHONY += missing-syscalls | ||
| 58 | missing-syscalls: scripts/checksyscalls.sh FORCE | ||
| 59 | $(call cmd,syscalls) | ||
| @@ -576,7 +576,7 @@ libs-y := $(libs-y1) $(libs-y2) | |||
| 576 | # --------------------------------------------------------------------------- | 576 | # --------------------------------------------------------------------------- |
| 577 | # vmlinux is built from the objects selected by $(vmlinux-init) and | 577 | # vmlinux is built from the objects selected by $(vmlinux-init) and |
| 578 | # $(vmlinux-main). Most are built-in.o files from top-level directories | 578 | # $(vmlinux-main). Most are built-in.o files from top-level directories |
| 579 | # in the kernel tree, others are specified in arch/$(ARCH)Makefile. | 579 | # in the kernel tree, others are specified in arch/$(ARCH)/Makefile. |
| 580 | # Ordering when linking is important, and $(vmlinux-init) must be first. | 580 | # Ordering when linking is important, and $(vmlinux-init) must be first. |
| 581 | # | 581 | # |
| 582 | # vmlinux | 582 | # vmlinux |
| @@ -603,6 +603,7 @@ vmlinux-init := $(head-y) $(init-y) | |||
| 603 | vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) | 603 | vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) |
| 604 | vmlinux-all := $(vmlinux-init) $(vmlinux-main) | 604 | vmlinux-all := $(vmlinux-init) $(vmlinux-main) |
| 605 | vmlinux-lds := arch/$(ARCH)/kernel/vmlinux.lds | 605 | vmlinux-lds := arch/$(ARCH)/kernel/vmlinux.lds |
| 606 | export KBUILD_VMLINUX_OBJS := $(vmlinux-all) | ||
| 606 | 607 | ||
| 607 | # Rule to link vmlinux - also used during CONFIG_KALLSYMS | 608 | # Rule to link vmlinux - also used during CONFIG_KALLSYMS |
| 608 | # May be overridden by arch/$(ARCH)/Makefile | 609 | # May be overridden by arch/$(ARCH)/Makefile |
| @@ -855,6 +856,7 @@ archprepare: prepare1 scripts_basic | |||
| 855 | 856 | ||
| 856 | prepare0: archprepare FORCE | 857 | prepare0: archprepare FORCE |
| 857 | $(Q)$(MAKE) $(build)=. | 858 | $(Q)$(MAKE) $(build)=. |
| 859 | $(Q)$(MAKE) $(build)=. missing-syscalls | ||
| 858 | 860 | ||
| 859 | # All the preparing.. | 861 | # All the preparing.. |
| 860 | prepare: prepare0 | 862 | prepare: prepare0 |
| @@ -1277,10 +1279,7 @@ endif | |||
| 1277 | ALLSOURCE_ARCHS := $(ARCH) | 1279 | ALLSOURCE_ARCHS := $(ARCH) |
| 1278 | 1280 | ||
| 1279 | define find-sources | 1281 | define find-sources |
