From 00bf6f67eb9f9adf4155047c9f334510044a819c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 1 Apr 2014 02:05:57 +0100 Subject: [PATCH] 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 Signed-off-by: Emil Velikov --- configure.ac | 3 --- src/gallium/Automake.inc | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index af1b0d1..165e54e 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 56f1433..7504056 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 \ -- 1.9.1