summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2014-11-16 10:16:47 +0000
committerJosé Fonseca <jfonseca@vmware.com>2014-11-16 10:16:47 +0000
commit4784623b3ef8a8325d7b92c3365400f23bae63e0 (patch)
treea8beb1720d724a0fa61542ddd7cf38e00e0ad691
parent45e2ba1b8c9aec47b089eed536d3d7c1fcfb9909 (diff)
gallium/auxiliary: Remove GALLIVM_CPP_SOURCES
Redundant. Should fix ttps://bugs.freedesktop.org/show_bug.cgi?id=86330
-rw-r--r--src/gallium/auxiliary/Makefile.am3
-rw-r--r--src/gallium/auxiliary/Makefile.sources6
-rw-r--r--src/gallium/auxiliary/SConscript1
3 files changed, 1 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 4b3ed920083..19037a271ef 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -30,8 +30,7 @@ AM_CXXFLAGS += \
$(LLVM_CXXFLAGS)
libgallium_la_SOURCES += \
- $(GALLIVM_SOURCES) \
- $(GALLIVM_CPP_SOURCES)
+ $(GALLIVM_SOURCES)
endif
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 73bc1ecfec5..bbb6dccb632 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -406,9 +406,3 @@ GALLIVM_SOURCES := \
gallivm/lp_bld_tgsi_soa.c \
gallivm/lp_bld_type.c \
gallivm/lp_bld_type.h
-
-GALLIVM_CPP_SOURCES := \
- gallivm/lp_bld_debug.cpp \
- gallivm/lp_bld_debug.h \
- gallivm/lp_bld_misc.cpp \
- gallivm/lp_bld_misc.h
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 94041d24778..6f67849d802 100644
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -42,7 +42,6 @@ source = env.ParseSourceList('Makefile.sources', [
if env['llvm']:
source += env.ParseSourceList('Makefile.sources', [
'GALLIVM_SOURCES',
- 'GALLIVM_CPP_SOURCES'
])
gallium = env.ConvenienceLibrary(