From 77a3efc6b907943903190b385fdf107c4acfcdca Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers Date: Thu, 19 Jul 2012 12:30:10 +1000 Subject: build/glsl: fix location of generated files. Like in src/mesa, use GLSL_BUILDDIR/GLSL_SRCDIR to unambiguously distinguish between in-tree and generated files. Reviewed-by: Eric Anholt Signed-off-by: Christopher James Halse Rogers --- src/glsl/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/glsl/Makefile.am') diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index d86153c48b..0ab6672114 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -23,9 +23,6 @@ # builtin_compiler is built before libglsl to generate builtin_function.cpp for libglsl. # For this to work, a dummy version of builtin_function.cpp, builtin_stubs.cpp, is used. -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ @@ -39,7 +36,6 @@ AM_CXXFLAGS = $(AM_CFLAGS) AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c -GLSL_SRCDIR=$(top_srcdir)/src/glsl include Makefile.sources noinst_LTLIBRARIES = libglslcommon.la libglsl.la -- cgit v1.2.3