diff options
| author | Jon TURNEY <[email protected]> | 2012-06-28 23:15:48 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-13 12:43:41 +0100 |
| commit | 68e04cc6014bf7a2c9bd0b3b783b4ec12aa2e824 (patch) | |
| tree | 41ca584f01c57b781d41d703f044f4452ba4e644 /src/glsl/tests | |
| parent | 284325d97b3049e59e64daf784e2b3858f0ffcf5 (diff) | |
automake: convert libglsl
v2: Use AM_V_GEN to silence generated code rules. Add BUILT_SOURCES to CLEANFILES
v3:
- Fix an accidental // in a path
- Use automake make rules for lex/yacc rather than writing our own
- Update .gitignore appropriately
- Build a libglcpp convenience library rather than awkwardly including
the files in libglsl and delegating the generation
- Remove libglsl.a compatibility link on clean
v4:
- Automake's rules for lex/yacc make .cc if source is .ll or .yy, and apparently we
must use those extensions "because of scons", so update everywhere glsl_parser.cpp
-> glsl_parser.cc and glsl_lexer.cpp -> glsl_lexer.cc. This fixes 'make tarballs'
and building with dricore enabled.
Signed-off-by: Jon TURNEY <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl/tests')
| -rw-r--r-- | src/glsl/tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am index d2facbaabb8..4829fb2fe0d 100644 --- a/src/glsl/tests/Makefile.am +++ b/src/glsl/tests/Makefile.am @@ -27,7 +27,7 @@ uniform_initializer_test_SOURCES = \ uniform_initializer_test_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/glsl/libglsl.a \ + $(top_builddir)/src/glsl/libglsl.la \ $(top_builddir)/src/mesa/libmesa.a \ -lpthread |