summaryrefslogtreecommitdiff
path: root/src/loader/Makefile.am
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-08-04 17:49:08 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-08-04 23:54:52 +0100
commit10e7c2c64d46da38d30d04a2c10c8c3cd5a30f7a (patch)
tree167cd089b54a9cd6040c19273ecd4619291c78a1 /src/loader/Makefile.am
parent6c530ad1160518d9f035da4aba5a9d4df7369972 (diff)
loader: rework xmlconfig dependency
Currently xmlconfig is conditionally used, only when --enable-dri is available. As the library has moved to src/util and has wider wisebase, this guard is no longer correct. Strictly speaking - it wasn't since the introduction of xmlconfig into st/nine a while ago. Unconditionally enable xmlconfig and drop the linking. As said before there's other users of the library, so depending on the configure options we will get multiple definitions of said symbols. NOTE: To avoid breaking other combinations, this commit adds the xmlconfig link to the required places - throughout gallium and the DRI loaders. Cc: Aaron Watry <awatry@gmail.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Diffstat (limited to 'src/loader/Makefile.am')
-rw-r--r--src/loader/Makefile.am15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 8b197f2995c..74ac6c51e77 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -26,6 +26,8 @@ EXTRA_DIST = SConscript
noinst_LTLIBRARIES = libloader.la
AM_CPPFLAGS = \
+ -I$(top_builddir)/src/util/ \
+ -DUSE_DRICONF \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
@@ -37,19 +39,6 @@ libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
libloader_la_SOURCES = $(LOADER_C_FILES)
libloader_la_LIBADD =
-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
-
-endif
-
if HAVE_LIBDRM
libloader_la_LIBADD += \
$(LIBDRM_LIBS)