On 2015-07-16 22:22, Ross Burton wrote:
> In parallel out-of-tree builds it is possible for e.g. ivi-shell/weston.ini to
> be written before ivi-shell/ exists. Solve this by creating the target
> directory first.
>
> Signed-off-by: Ross Burton <ross.bur...@intel.com>
> ---
> Makefile.am | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Makefile.am b/Makefile.am
> index d7b45a8..76c91fd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -20,6 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
> $< > $@
>
> ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> + $(AM_V_GEN)$(MKDIR_P) $(dir $@)
You should have only one $(AM_V_GEN) per rule. Otherwise output will be:
GEN ivi-shell/weston.ini
GEN ivi-shell/weston.ini
It may look like a bug to the user.
You should do it that way:
$(AM_V_GEN)$(MKDIR_P) $(dir $@); $(SED) \
or
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> $(AM_V_GEN)$(SED) \
> -e 's|@bindir[@]|$(bindir)|g' \
> -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> @@ -29,6 +30,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> $< > $@
>
> tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
> + $(AM_V_GEN)$(MKDIR_P) $(dir $@)
> $(AM_V_GEN)$(SED) \
> -e 's|@bindir[@]|$(bindir)|g' \
> -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
>
Once “fixed”:
Reviewed-by: Quentin Glidic <sardemff7+...@sardemff7.net>
--
Quentin “Sardem FF7” Glidic
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
