On Mon, Nov 12, 2012 at 4:55 PM, Brian Paul <bri...@vmware.com> wrote: > On 11/12/2012 05:43 PM, Brian Paul wrote: >> >> >> Broken by: >> >> commit a665cf1226b80ec52a0c1a4a38378df4389e8ebf >> Author: Eric Anholt <e...@anholt.net> >> Date: Tue Nov 6 23:18:38 2012 -0800 >> >> automake: Merge *_CXX_FILES variables in the glsl build. >> >> Reviewed-by: Chad Versace <chad.vers...@linux.intel.com> >> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> >> >> >> I still haven't figured out what's wrong... >> >> Just type 'scons' to try it. > > > OK, this change seems to fix it: > > > diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources > index 6c031b6..5e098fc 100644 > --- a/src/glsl/Makefile.sources > +++ b/src/glsl/Makefile.sources > @@ -83,8 +83,7 @@ LIBGLSL_FILES = \ > $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ > $(GLSL_SRCDIR)/s_expression.cpp \ > $(GLSL_SRCDIR)/strtod.c \ > - $(GLSL_SRCDIR)/ralloc.c \ > - $() > + $(GLSL_SRCDIR)/ralloc.c > > # glsl_compiler > > > > Is there some special meaning to the $() line that I removed?
I think it's just NULL, which allows you to not have to modify other lines (by adding \ to them) when you add a file. pixman uses $(NULL) where NULL isn't defined. I'm not sure if that would help this case though. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
