<html>
    <head>
      <base href="https://bugs.freedesktop.org/" />
    </head>
    <body>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEW "
   title="NEW --- - [recent build error] glsl_parser.h: No such file or directory"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=56685#c7">Comment # 7</a>
              on <a class="bz_bug_link 
          bz_status_NEW "
   title="NEW --- - [recent build error] glsl_parser.h: No such file or directory"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=56685">bug 56685</a>
              from <span class="vcard"><a class="email" href="mailto:thierry.reding@avionic-design.de" title="Thierry Reding <thierry.reding@avionic-design.de>"> <span class="fn">Thierry Reding</span></a>
</span></b>
        <pre>Comment on <span class=""><a href="attachment.cgi?id=69667" name="attach_69667" title="Possible Fix">attachment 69667</a> <a href="attachment.cgi?id=69667&action=edit" title="Possible Fix">[details]</a></span> <a href='page.cgi?id=splinter.html&bug=56685&attachment=69667'>[review]</a>
Possible Fix

Review of <span class=""><a href="attachment.cgi?id=69667" name="attach_69667" title="Possible Fix">attachment 69667</a> <a href="attachment.cgi?id=69667&action=edit" title="Possible Fix">[details]</a></span> <a href='page.cgi?id=splinter.html&bug=56685&attachment=69667'>[review]</a>:
-----------------------------------------------------------------

I came up with a very similar, though simpler patch that I've successfully
tested on top of latest master, both in-tree and out-of-tree as well as
parallel and non-parallel builds.

With the below comments applied, Johannes' patch becomes effectively the
same as mine.

::: src/glsl/builtin_compiler/Makefile.am
@@ +29,4 @@
<span class="quote">>  LD = @LD_FOR_BUILD@
>  LDFLAGS = @LDFLAGS_FOR_BUILD@
>  
> +include ../Makefile.sources</span >

You don't need to move the Makefile.sources include
because GLSL_SRCDIR, GLSL_BUILDDIR and AM_CFLAGS
are all lazily evaluated.

Don't forget to remove the corresponding comment in
the commit message.

@@ +36,5 @@
<span class="quote">>        -I $(top_srcdir)/src/mapi \
>    -I $(top_srcdir)/src/mesa \
>    -I $(GLSL_SRCDIR) \
>    -I $(GLSL_SRCDIR)/glcpp \
> +  -I $(GLSL_BUILDDIR) \</span >

Can we please sort this above GLSL_SRCDIR so that
files in GLSL_BUILDDIR will take precedence?</pre>
        </div>
      </p>
      <hr>
      <span>You are receiving this mail because:</span>
      
      <ul>
          <li>You are the assignee for the bug.</li>
      </ul>
    </body>
</html>