[PATCH] Split Multimage Makefile rule in explicit and implicit parts

[PATCH] Split Multimage Makefile rule in explicit and implicit parts

[Lucas Stach]

Fixes build with make version >=3.82

Frome the make 3.82 NEWS file:
* WARNING: Backward-incompatibility!
  In previous versions of make it was acceptable to list one or more explicit
  targets followed by one or more pattern targets in the same rule and it
  worked "as expected".  However, this was not documented as acceptable and if
  you listed any explicit targets AFTER the pattern targets, the entire rule
  would be mis-parsed.  This release removes this ability completely: make
  will generate an error message if you mix explicit and pattern targets in
  the same rule.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
Feel free to squash this into the offending commit.
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d82e795..811b658 100644
--- a/Makefile
+++ b/Makefile
@@ -481,7 +481,9 @@ export KBUILD_BINARY ?= barebox.bin
 barebox-flash-image: $(KBUILD_IMAGE) FORCE
 	$(call if_changed,ln)
 
-images images/%.s: barebox.bin FORCE
+images: barebox.bin FORCE
+	$(Q)$(MAKE) $(build)=images $@
+images/%.s: barebox.bin FORCE
 	$(Q)$(MAKE) $(build)=images $@
 
 ifdef CONFIG_PBL_MULTI_IMAGES
-- 
1.8.3.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] Split Multimage Makefile rule in explicit and implicit parts

[Sascha Hauer]

On Sat, Jun 29, 2013 at 12:09:50AM +0200, Lucas Stach wrote:
> Fixes build with make version >=3.82
> 
> Frome the make 3.82 NEWS file:
> * WARNING: Backward-incompatibility!
>   In previous versions of make it was acceptable to list one or more explicit
>   targets followed by one or more pattern targets in the same rule and it
>   worked "as expected".  However, this was not documented as acceptable and if
>   you listed any explicit targets AFTER the pattern targets, the entire rule
>   would be mis-parsed.  This release removes this ability completely: make
>   will generate an error message if you mix explicit and pattern targets in
>   the same rule.
> 
> Signed-off-by: Lucas Stach <dev@lynxeye.de>

Squashed into the original commit.

Thanks
 Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox