mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-27 08:20:12 +01:00
10e7c2c64d
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>
56 lines
1.8 KiB
Makefile
56 lines
1.8 KiB
Makefile
# Copyright © 2012 Intel Corporation
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice (including the next
|
|
# paragraph) shall be included in all copies or substantial portions of the
|
|
# Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
# IN THE SOFTWARE.
|
|
|
|
include Makefile.sources
|
|
|
|
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 \
|
|
$(VISIBILITY_CFLAGS) \
|
|
$(XCB_DRI3_CFLAGS) \
|
|
$(LIBDRM_CFLAGS)
|
|
|
|
libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
|
|
libloader_la_SOURCES = $(LOADER_C_FILES)
|
|
libloader_la_LIBADD =
|
|
|
|
if HAVE_LIBDRM
|
|
libloader_la_LIBADD += \
|
|
$(LIBDRM_LIBS)
|
|
endif
|
|
|
|
if HAVE_PLATFORM_X11
|
|
if HAVE_DRI3
|
|
noinst_LTLIBRARIES += libloader_dri3_helper.la
|
|
|
|
libloader_dri3_helper_la_SOURCES = \
|
|
loader_dri3_helper.c \
|
|
loader_dri3_helper.h
|
|
libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS)
|
|
endif
|
|
endif
|