On 08/13/2012 12:48 PM, Matt Turner wrote: > Cc: Kenneth Graunke <kenn...@whitecape.org> > --- > Added builtins/* back, with $(srcdir) to fix out-of-tree builds. > > src/glsl/Makefile.am | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am > index 0ab6672..20639c9 100644 > --- a/src/glsl/Makefile.am > +++ b/src/glsl/Makefile.am > @@ -92,8 +92,8 @@ glsl_parser.cc glsl_parser.h: glsl_parser.yy > BUILT_SOURCES = glsl_parser.h builtin_function.cpp > CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) > > -builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/glsl/* > builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py > builtin_compiler$(EXEEXT) > - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) > builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp > || rm -f builtin_function.cpp > +builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* > $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py > $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler$(EXEEXT) > + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) > $(srcdir)/builtins/tools/generate_builtins.py ./builtin_compiler > > builtin_function.cpp || rm -f builtin_function.cpp > > glcpp/libglcpp.la: > cd glcpp ; $(MAKE) $(AM_MAKEFLAGS)
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
