aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/builtin_compiler/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-24 08:40:35 +0100
committermarha <marha@users.sourceforge.net>2013-01-24 08:40:35 +0100
commit3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch)
tree9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /mesalib/src/glsl/builtin_compiler/Makefile.am
parent7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff)
parent06872e284da1c00ce03b234ca24aefeac64990d2 (diff)
downloadvcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz
vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2
vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 Conflicts: mesalib/src/glsl/.gitignore
Diffstat (limited to 'mesalib/src/glsl/builtin_compiler/Makefile.am')
-rw-r--r--mesalib/src/glsl/builtin_compiler/Makefile.am36
1 files changed, 14 insertions, 22 deletions
diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am
index d27aca555..1a863b228 100644
--- a/mesalib/src/glsl/builtin_compiler/Makefile.am
+++ b/mesalib/src/glsl/builtin_compiler/Makefile.am
@@ -40,31 +40,23 @@ AM_CFLAGS = \
AM_CXXFLAGS = $(AM_CFLAGS)
-AM_YFLAGS = -v -d -p "glcpp_parser_"
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
include ../Makefile.sources
noinst_PROGRAMS = builtin_compiler
+noinst_LTLIBRARIES = libglslcore.la libglcpp.la
-builtin_compiler_SOURCES = \
- $(GLSL_SRCDIR)/glcpp/glcpp-lex.l \
- $(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
- $(LIBGLCPP_FILES) \
- $(GLSL_SRCDIR)/glsl_lexer.ll \
- $(GLSL_BUILDDIR)/glsl_parser.cc \
- $(LIBGLSL_FILES) \
- $(LIBGLSL_CXX_FILES) \
- $(top_srcdir)/src/mesa/main/hash_table.c \
- $(top_srcdir)/src/mesa/program/prog_hash_table.c \
- $(top_srcdir)/src/mesa/program/symbol_table.c \
- $(GLSL_COMPILER_CXX_FILES) \
- builtin_stubs.cpp
+libglcpp_la_SOURCES = \
+ $(LIBGLCPP_GENERATED_FILES) \
+ $(LIBGLCPP_FILES)
-BUILT_SOURCES = \
- glcpp-lex.c \
- glcpp-parse.c \
- glcpp-parse.h \
- glsl_lexer.cc
+libglslcore_la_SOURCES = \
+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+ $(LIBGLSL_FILES)
-CLEANFILES = $(BUILT_SOURCES)
+builtin_compiler_SOURCES = \
+ $(top_srcdir)/src/mesa/main/hash_table.c \
+ $(top_srcdir)/src/mesa/program/prog_hash_table.c\
+ $(top_srcdir)/src/mesa/program/symbol_table.c \
+ $(BUILTIN_COMPILER_CXX_FILES) \
+ $(GLSL_COMPILER_CXX_FILES)
+builtin_compiler_LDADD = libglslcore.la libglcpp.la