aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/gallium/Automake.inc9
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a154177199a..0ae332bb7ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1049,12 +1049,9 @@ if test "x$enable_dri" = xyes; then
# put all the necessary libs together
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
- GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS"
-
fi
AC_SUBST([DRI_LIB_DEPS])
-AC_SUBST([GALLIUM_DRI_LIB_DEPS])
DRI_DIRS=''
dnl Duplicates in DRI_DIRS are removed by sorting it at the end of this block
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 56f1433a0f8..7504056565b 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -86,6 +86,15 @@ GALLIUM_OMX_LINKER_FLAGS = \
$(GC_SECTIONS) \
-Wl,--no-undefined
+GALLIUM_DRI_LIB_DEPS = \
+ $(SELINUX_LIBS) \
+ $(LIBDRM_LIBS) \
+ $(EXPAT_LIBS) \
+ -lm \
+ $(CLOCK_LIB) \
+ $(PTHREAD_LIBS) \
+ $(DLOPEN_LIBS)
+
GALLIUM_VDPAU_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \