summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile.am
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-11-06 23:18:36 -0800
committerChad Versace <[email protected]>2012-11-12 15:52:41 -0800
commite9e8e194e2c607f14cbf3c3df6d5daeb1890603b (patch)
tree5ab199e8ff284e7cee04fcba5be020dd51cbba17 /src/mesa/Makefile.am
parentbe655ec61760af0056a2ee40b3a616bebe6d0544 (diff)
automake: Merge separated *_CXX_FILES variables to *_FILES in core mesa.
They were always used with the corresponding *_FILES variables now that automake handles rule generation. Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/Makefile.am')
-rw-r--r--src/mesa/Makefile.am2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 1f897257ed9..34e8c82fdb1 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -122,7 +122,6 @@ endif
libmesa_la_SOURCES = \
$(MESA_FILES) \
- $(MESA_CXX_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
@@ -130,7 +129,6 @@ libmesa_la_LDFLAGS =
libmesagallium_la_SOURCES = \
$(MESA_GALLIUM_FILES) \
- $(MESA_GALLIUM_CXX_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la