diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:36:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:36:10 +0100 |
| commit | 06872e284da1c00ce03b234ca24aefeac64990d2 (patch) | |
| tree | e1e8bee8a20f7b759b50edfc21d2313489280d10 /mesalib/src/glsl/builtin_compiler/Makefile.am | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.gz vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.bz2 vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.zip | |
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4
mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef
pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa
xkbcomp: 705b9bbb426410f9510601c7010da51184919b36
xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Diffstat (limited to 'mesalib/src/glsl/builtin_compiler/Makefile.am')
| -rw-r--r-- | mesalib/src/glsl/builtin_compiler/Makefile.am | 36 |
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 |