From febec731475a5b288cc50660b2d32780e395b950 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 28 May 2014 15:43:35 +0100 Subject: [PATCH] st/egl: do not link against libloader MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Move the link to the final targets, like any other place in mesa/gallium. This allows better visibilty and will prevent us from including the library archive twice. Resolves multiple definition of `loader_get_pci_id_for_fd' multiple definition of `loader_get_pci_id_for_fd' Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79263 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79382 Cc: Chia-I Wu Signed-off-by: Emil Velikov Reviewed-by: Chia-I Wu Tested-by: Michel Dänzer --- src/gallium/state_trackers/egl/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index 26266ed..b7dcdab 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -65,7 +65,6 @@ endif if HAVE_EGL_PLATFORM_DRM libegl_la_SOURCES += $(drm_FILES) -libegl_la_LIBADD = $(top_builddir)/src/loader/libloader.la AM_CFLAGS += \ $(LIBDRM_CFLAGS) AM_CPPFLAGS += \ -- 2.7.4