diff options
| author | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2012-07-19 12:30:10 +1000 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-08-13 12:24:39 -0700 |
| commit | 77a3efc6b907943903190b385fdf107c4acfcdca (patch) | |
| tree | 71a436d544cbef3ef5ad102097a9049f39413ddd /src/glsl/Makefile.sources | |
| parent | 37a1b8083e7f7a6c3abe3843cfaed84163f2d19f (diff) | |
| download | external_mesa3d-77a3efc6b907943903190b385fdf107c4acfcdca.zip external_mesa3d-77a3efc6b907943903190b385fdf107c4acfcdca.tar.gz external_mesa3d-77a3efc6b907943903190b385fdf107c4acfcdca.tar.bz2 | |
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 <eric@anholt.net>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Diffstat (limited to 'src/glsl/Makefile.sources')
| -rw-r--r-- | src/glsl/Makefile.sources | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 765f06a..aafb53e 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -1,6 +1,7 @@ # shared source lists for Makefile, SConscript, and Android.mk -GLSL_SRCDIR ?= . +GLSL_SRCDIR = $(top_srcdir)/src/glsl +GLSL_BUILDDIR = $(top_builddir)/src/glsl # libglcpp @@ -8,8 +9,8 @@ LIBGLCPP_FILES = \ $(GLSL_SRCDIR)/glcpp/pp.c LIBGLCPP_GENERATED_FILES = \ - $(GLSL_SRCDIR)/glcpp/glcpp-lex.c \ - $(GLSL_SRCDIR)/glcpp/glcpp-parse.c + $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \ + $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c # libglsl @@ -102,10 +103,10 @@ BUILTIN_COMPILER_CXX_FILES = \ $(GLSL_SRCDIR)/builtin_stubs.cpp BUILTIN_COMPILER_GENERATED_CXX_FILES = \ - $(GLSL_SRCDIR)/glsl_lexer.cc \ - $(GLSL_SRCDIR)/glsl_parser.cc + $(GLSL_BUILDDIR)/glsl_lexer.cc \ + $(GLSL_BUILDDIR)/glsl_parser.cc # libglsl generated sources LIBGLSL_GENERATED_CXX_FILES = \ - $(GLSL_SRCDIR)/$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ - $(GLSL_SRCDIR)/builtin_function.cpp + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(GLSL_BUILDDIR)/builtin_function.cpp |