summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-06-23 18:05:25 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-06-23 18:05:25 -0700
commita62edcce4eb4c800d972817a20ee874bf2a2c3ef (patch)
tree46083a8762d45a6c595c7aaee2bb1cd0fc36eb62 /src/Makefile.am
parent9b9f973ca6d3cc1ec5be27857def00a83c032464 (diff)
parent6844d6b7f8398a25eff511541b187afeb1199ce0 (diff)
downloadexternal_mesa3d-a62edcce4eb4c800d972817a20ee874bf2a2c3ef.zip
external_mesa3d-a62edcce4eb4c800d972817a20ee874bf2a2c3ef.tar.gz
external_mesa3d-a62edcce4eb4c800d972817a20ee874bf2a2c3ef.tar.bz2
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bf76e35..d41a087 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,4 +76,5 @@ noinst_LTLIBRARIES = libglsl_util.la
libglsl_util_la_SOURCES = \
mesa/main/imports.c \
mesa/program/prog_hash_table.c \
- mesa/program/symbol_table.c
+ mesa/program/symbol_table.c \
+ mesa/program/dummy_errors.c