diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-13 17:00:45 -0500 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-12-13 17:00:45 -0500 |
| commit | 31110ebbec8688c6e9597b641101afc94e1c762a (patch) | |
| tree | 208aaad7e40cbb86bc125760664911da8cd4eebb | |
| parent | abf681ce5b6f83f0b8883e0f2c12d197a38543dd (diff) | |
kbuild: fix make incompatibility
"Paul Smith" <psmith@gnu.org> reported that we would fail
to build with a new check that may be enabled in an
upcoming version of make.
The error was:
Makefile:442: *** mixed implicit and normal rules. Stop.
The problem is that we did stuff like this:
config %config: ...
The solution was simple - the above was split into two with identical
prerequisites and commands.
With only three lines it was not worth to try to avoid the duplication.
Cc: "Paul Smith" <psmith@gnu.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
| @@ -439,7 +439,11 @@ ifeq ($(config-targets),1) | |||
| 439 | include $(srctree)/arch/$(SRCARCH)/Makefile | 439 | include $(srctree)/arch/$(SRCARCH)/Makefile |
| 440 | export KBUILD_DEFCONFIG KBUILD_KCONFIG | 440 | export KBUILD_DEFCONFIG KBUILD_KCONFIG |
| 441 | 441 | ||
| 442 | config %config: scripts_basic outputmakefile FORCE | 442 | config: scripts_basic outputmakefile FORCE |
| 443 | $(Q)mkdir -p include/linux include/config | ||
| 444 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ | ||
| 445 | |||
| 446 | %config: scripts_basic outputmakefile FORCE | ||
| 443 | $(Q)mkdir -p include/linux include/config | 447 | $(Q)mkdir -p include/linux include/config |
| 444 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ | 448 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ |
| 445 | 449 | ||
| @@ -1493,7 +1497,11 @@ endif | |||
| 1493 | $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) | 1497 | $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) |
| 1494 | 1498 | ||
| 1495 | # Modules | 1499 | # Modules |
| 1496 | / %/: prepare scripts FORCE | 1500 | /: prepare scripts FORCE |
| 1501 | $(cmd_crmodverdir) | ||
| 1502 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ | ||
| 1503 | $(build)=$(build-dir) | ||
| 1504 | %/: prepare scripts FORCE | ||
| 1497 | $(cmd_crmodverdir) | 1505 | $(cmd_crmodverdir) |
| 1498 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ | 1506 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ |
| 1499 | $(build)=$(build-dir) | 1507 | $(build)=$(build-dir) |
