diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-03-10 12:28:58 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-03-10 12:31:06 +0100 |
| commit | 73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe (patch) | |
| tree | 5febaffdd061ec155e370a08be5c5db3152a9434 | |
| parent | e93bc1a0cab3e54e3c1947e01c8e73892e35630d (diff) | |
| download | lwn-73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe.tar.gz lwn-73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe.zip | |
kbuild: Generate modules.builtin in make modules_install
The previous approach didn't work if one did
make modules && make modules_install
Add modules.builtin as dependency of _modinst_, which is the target that
actually needs the file.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1086,7 +1086,7 @@ ifdef CONFIG_MODULES # By default, build modules as well -all: modules modules.builtin +all: modules # Build modules # @@ -1104,7 +1104,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin -%/modules.builtin: include/config/auto.conf | modules +%/modules.builtin: include/config/auto.conf $(Q)$(MAKE) $(modbuiltin)=$* @@ -1117,7 +1117,7 @@ PHONY += modules_install modules_install: _modinst_ _modinst_post PHONY += _modinst_ -_modinst_: +_modinst_: modules.builtin @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ echo "Warning: you may need to install module-init-tools"; \ echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ |