summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2012-07-19 12:30:10 +1000
committerMatt Turner <mattst88@gmail.com>2012-08-13 12:24:39 -0700
commit77a3efc6b907943903190b385fdf107c4acfcdca (patch)
tree71a436d544cbef3ef5ad102097a9049f39413ddd /src
parent37a1b8083e7f7a6c3abe3843cfaed84163f2d19f (diff)
downloadexternal_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')
-rw-r--r--src/glsl/Makefile.am4
-rw-r--r--src/glsl/Makefile.sources15
-rw-r--r--src/glsl/glcpp/Makefile.am4
3 files changed, 8 insertions, 15 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index d86153c..0ab6672 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
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
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index e7d5d2c..7a95b68 100644
--- a/src/glsl/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
@@ -20,10 +20,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-# Hack to make some of the non-automake variables work.
-TOP=$(top_builddir)
-
-GLSL_SRCDIR=$(top_srcdir)/src/glsl
include ../Makefile.sources
AM_CFLAGS = \