[Mesa-dev] [PATCHv2 automake] pipe-loader: Fix some undefined symbols.

[Johannes Obermayr]

---
v2: galahad is conditional
---
 src/gallium/drivers/radeon/Makefile.am      |    5 +++--
 src/gallium/targets/pipe-loader/Makefile.am |    7 +++++++
 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index cbad5b7..adb5ebe 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -4,7 +4,8 @@ include $(top_srcdir)/src/gallium/Automake.inc
 noinst_LTLIBRARIES = libradeon.la
 
 AM_CXXFLAGS = \
-	$(filter-out -DDEBUG, $(LLVM_CXXFLAGS))
+	$(filter-out -DDEBUG, $(LLVM_CXXFLAGS)) \
+	$(DEFINES)
 
 AM_CFLAGS = \
 	$(GALLIUM_CFLAGS) \
@@ -15,7 +16,7 @@ AM_CPPFLAGS = -DEXTERNAL_LLVM
 tablegen = $(LLVM_BINDIR)/llvm-tblgen -I $(LLVM_INCLUDEDIR) -I $(srcdir) $1 $2 -o $3
 
 libradeon_la_SOURCES =	\
-	$(CXX_FILES) \
+	$(CPP_FILES) \
 	$(C_FILES)
 
 SIRegisterInfo.td: SIGenRegisterInfo.pl
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 1a66835..d02d1ae 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -15,10 +15,17 @@ gbm_LTLIBRARIES =
 
 PIPE_LIBS = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
 	$(DLOPEN_LIBS) \
 	-lpthread \
 	-lm
 
+if HAVE_GALAHAD_GALLIUM
+PIPE_LIBS += $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la
+endif
+
+
 if HAVE_GALLIUM_I915
 gbm_LTLIBRARIES += pipe_i915.la
 pipe_i915_la_SOURCES = pipe_i915.c
-- 
1.7.10.4