Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rog...@canonical.com>
---
src/glsl/Makefile | 9 ++++++---
src/glsl/Makefile.sources | 12 ++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3cf9fc9..872677e 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -11,19 +11,22 @@ GLSL_SRCDIR=.
include Makefile.sources
GLCPP_SOURCES = \
- $(LIBGLCPP_GENERATED_FILES) \
+ glcpp/glcpp-lex.c \
+ glcpp/glcpp-parse.c \
$(LIBGLCPP_FILES) \
ralloc.c \
glcpp/glcpp.c
C_SOURCES = \
- $(LIBGLCPP_GENERATED_FILES) \
+ glcpp/glcpp-lex.c \
+ glcpp/glcpp-parse.c \
$(LIBGLCPP_FILES) \
$(LIBGLSL_FILES)
# common sources for builtin_compiler and libglsl
CXX_SOURCES = \
- $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+ glsl_lexer.cpp \
+ glsl_parser.cpp \
$(LIBGLSL_CXX_FILES)
LIBS = \
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 0425fa3..70edc04 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -8,8 +8,8 @@ LIBGLCPP_FILES = \
$(GLSL_SRCDIR)/glcpp/pp.c
LIBGLCPP_GENERATED_FILES = \
- $(GLSL_SRCDIR)/glcpp/glcpp-lex.c \
- $(GLSL_SRCDIR)/glcpp/glcpp-parse.c
+ $(TOP)/src/glsl/glcpp/glcpp-lex.c \
+ $(TOP)/src/glsl/glcpp/glcpp-parse.c
# libglsl
@@ -101,10 +101,10 @@ BUILTIN_COMPILER_CXX_FILES = \
$(GLSL_SRCDIR)/builtin_stubs.cpp
BUILTIN_COMPILER_GENERATED_CXX_FILES = \
- $(GLSL_SRCDIR)/glsl_lexer.cpp \
- $(GLSL_SRCDIR)/glsl_parser.cpp
+ $(TOP)/src/glsl/glsl_lexer.cpp \
+ $(TOP)/src/glsl/glsl_parser.cpp
# libglsl generated sources
LIBGLSL_GENERATED_CXX_FILES = \
- $(GLSL_SRCDIR)/$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
- $(GLSL_SRCDIR)/builtin_function.cpp
+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+ $(TOP)/src/glsl/builtin_function.cpp
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
