From: Nicolai Hähnle <nicolai.haeh...@amd.com>
This aligns with the fact that we also check for EXPAT_LIBS
unconditionally in configure.ac now. It should make all the
various build permutations of Clover work (whether DRI is
enabled or disabled in the build).
Cc: Aaron Watry <awa...@gmail.com>
Cc: Emil Velikov <emil.veli...@collabora.com>
--
This change keeps everything green on Travis, and it should fix
the duplicate-symbol linker error seen by Aaron and others when
building Clover.
---
src/gallium/targets/opencl/Makefile.am | 1 -
src/loader/Makefile.am | 13 +++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/gallium/targets/opencl/Makefile.am
b/src/gallium/targets/opencl/Makefile.am
index e88fa0fd382..c9d2be7afd0 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -19,7 +19,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
- $(top_builddir)/src/util/libxmlconfig.la \
$(EXPAT_LIBS) \
$(LIBELF_LIBS) \
$(DLOPEN_LIBS) \
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 8b197f2995c..5ed87820664 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -33,21 +33,18 @@ AM_CPPFLAGS = \
$(XCB_DRI3_CFLAGS) \
$(LIBDRM_CFLAGS)
-libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
+libloader_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DUSE_DRICONF
libloader_la_SOURCES = $(LOADER_C_FILES)
-libloader_la_LIBADD =
+libloader_la_LIBADD = \
+ $(top_builddir)/src/util/libxmlconfig.la
if HAVE_DRICOMMON
libloader_la_CPPFLAGS += \
-I$(top_builddir)/src/util/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \
- -I$(top_srcdir)/src/mapi/ \
- -DUSE_DRICONF
-
-libloader_la_LIBADD += \
- $(top_builddir)/src/util/libxmlconfig.la
-
+ -I$(top_srcdir)/src/mapi/
endif
if HAVE_LIBDRM
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
