diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-08-08 15:36:08 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-25 03:01:49 -0400 |
| commit | b805aa0e79c78bd05ad1f5c52ec126a19531edb0 (patch) | |
| tree | 72d8e863f631d3ea5cdf8a9c5e0ddab2d271b0ef | |
| parent | 45d506bd65e2e35881d8276c111b647807823d19 (diff) | |
kbuild: make -rR is now default
Do not specify -rR anymore - it is default.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
| @@ -897,11 +897,11 @@ PHONY += headers_install | |||
| 897 | headers_install: include/linux/version.h scripts_basic FORCE | 897 | headers_install: include/linux/version.h scripts_basic FORCE |
| 898 | $(Q)$(MAKE) $(build)=scripts scripts/unifdef | 898 | $(Q)$(MAKE) $(build)=scripts scripts/unifdef |
| 899 | $(Q)rm -rf $(INSTALL_HDR_PATH)/include | 899 | $(Q)rm -rf $(INSTALL_HDR_PATH)/include |
| 900 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include | 900 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include |
| 901 | 901 | ||
| 902 | PHONY += headers_check | 902 | PHONY += headers_check |
| 903 | headers_check: headers_install | 903 | headers_check: headers_install |
| 904 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1 | 904 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1 |
| 905 | 905 | ||
| 906 | # --------------------------------------------------------------------------- | 906 | # --------------------------------------------------------------------------- |
| 907 | # Modules | 907 | # Modules |
| @@ -917,7 +917,7 @@ all: modules | |||
| 917 | PHONY += modules | 917 | PHONY += modules |
| 918 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) | 918 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) |
| 919 | @echo ' Building modules, stage 2.'; | 919 | @echo ' Building modules, stage 2.'; |
| 920 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost | 920 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
| 921 | 921 | ||
| 922 | 922 | ||
| 923 | # Target to prepare building external modules | 923 | # Target to prepare building external modules |
| @@ -943,7 +943,7 @@ _modinst_: | |||
| 943 | rm -f $(MODLIB)/build ; \ | 943 | rm -f $(MODLIB)/build ; \ |
| 944 | ln -s $(objtree) $(MODLIB)/build ; \ | 944 | ln -s $(objtree) $(MODLIB)/build ; \ |
| 945 | fi | 945 | fi |
| 946 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst | 946 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst |
| 947 | 947 | ||
| 948 | # If System.map exists, run depmod. This deliberately does not have a | 948 | # If System.map exists, run depmod. This deliberately does not have a |
| 949 | # dependency on System.map since that would run the dependency tree on | 949 | # dependency on System.map since that would run the dependency tree on |
| @@ -1156,7 +1156,7 @@ $(module-dirs): crmodverdir $(objtree)/Module.symvers | |||
| 1156 | 1156 | ||
| 1157 | modules: $(module-dirs) | 1157 | modules: $(module-dirs) |
| 1158 | @echo ' Building modules, stage 2.'; | 1158 | @echo ' Building modules, stage 2.'; |
| 1159 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost | 1159 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
| 1160 | 1160 | ||
| 1161 | PHONY += modules_install | 1161 | PHONY += modules_install |
| 1162 | modules_install: _emodinst_ _emodinst_post | 1162 | modules_install: _emodinst_ _emodinst_post |
| @@ -1165,7 +1165,7 @@ install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra) | |||
| 1165 | PHONY += _emodinst_ | 1165 | PHONY += _emodinst_ |
| 1166 | _emodinst_: | 1166 | _emodinst_: |
| 1167 | $(Q)mkdir -p $(MODLIB)/$(install-dir) | 1167 | $(Q)mkdir -p $(MODLIB)/$(install-dir) |
| 1168 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst | 1168 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst |
| 1169 | 1169 | ||
| 1170 | # Run depmod only is we have System.map and depmod is executable | 1170 | # Run depmod only is we have System.map and depmod is executable |
| 1171 | quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) | 1171 | quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) |
| @@ -1381,7 +1381,7 @@ endif | |||
| 1381 | %.ko: prepare scripts FORCE | 1381 | %.ko: prepare scripts FORCE |
| 1382 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ | 1382 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ |
| 1383 | $(build)=$(build-dir) $(@:.ko=.o) | 1383 | $(build)=$(build-dir) $(@:.ko=.o) |
| 1384 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost | 1384 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
| 1385 | 1385 | ||
| 1386 | # FIXME Should go into a make.lib or something | 1386 | # FIXME Should go into a make.lib or something |
| 1387 | # =========================================================================== | 1387 | # =========================================================================== |
