automake: move GALLIUM_DRI_LIB_DEPS to Automake.inc

With recent commit we started de-duplicating all of the compiler/
linker flags moving their handling inside Automake.inc.

This did not take into consideration that the above variable was set
at configure time, leading to issues on certain build combinations.

Move the variable to where it's used/handled thus cleaning up
configure.ac.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76848
Tested-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/configure.ac b/configure.ac
index a154177199a626e7c801945515b8e9b953d6fdaa..0ae332bb7ad79f1092cf496da73cb8e616b1ed85 100644 (file)
--- 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 56f1433a0f8533e584ac65d5296d05fd303a50c2..7504056565be17b3b87c17d4724b0b9029e1115e 100644 (file)
--- 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 \