Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Create output directory in Makefile.modbuiltin
kbuild: Generate modules.builtin in make modules
+2
-2
Makefile
+2
-2
Makefile
···
1095
1095
# using awk while concatenating to the final file.
1096
1096
1097
1097
PHONY += modules
1098
-
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
1098
+
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
1099
1099
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
1100
1100
@$(kecho) ' Building modules, stage 2.';
1101
1101
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
···
1117
1117
modules_install: _modinst_ _modinst_post
1118
1118
1119
1119
PHONY += _modinst_
1120
-
_modinst_: modules.builtin
1120
+
_modinst_:
1121
1121
@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
1122
1122
echo "Warning: you may need to install module-init-tools"; \
1123
1123
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\
+5
scripts/Makefile.modbuiltin
+5
scripts/Makefile.modbuiltin
···
14
14
15
15
include scripts/Kbuild.include
16
16
17
+
ifneq ($(KBUILD_SRC),)
18
+
# Create output directory if not already present
19
+
_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
20
+
endif
21
+
17
22
# The filename Kbuild has precedence over Makefile
18
23
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
19
24
kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)