diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 16:10:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 16:10:57 +1100 |
| commit | eaac02b2240d84e0489d6cabdad066073b03b4bd (patch) | |
| tree | 77f64c962af2ebe764a416844c0126cce7ce6503 | |
| parent | 2bab12d7007baf349bc02d5a10a28699dd0bb3a1 (diff) | |
Revert "kbuild: Do not unnecessarily regenerate modules.builtin"
This reverts commit a6c366324cacd5f71107dd01362b995a1c67b1ad.
| -rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -882,6 +882,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ; PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +ifdef CONFIG_MODULES + $(Q)$(MAKE) $(modbuiltin)=$@ +endif # Build the kernel release string # @@ -1086,7 +1089,7 @@ ifdef CONFIG_MODULES # By default, build modules as well -all: modules modules.builtin +all: modules # Build modules # @@ -1097,16 +1100,11 @@ all: modules modules.builtin PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.builtin) > $(objtree)/modules.builtin @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) - $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin - -%/modules.builtin: include/config/auto.conf | modules - $(Q)$(MAKE) $(modbuiltin)=$* - # Target to prepare building external modules PHONY += modules_prepare |