17 files changed, 7 insertions, 49 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index d014e275a96..a8981fb11d5 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -116,4 +116,9 @@ GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS)
 GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
 GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
 
+GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
+GALLIUM_VDPAU_LIB_DEPS += $(LLVM_LIBS)
+GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
+GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
+
 endif
diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am
index 53fce745245..6347a552f07 100644
--- a/src/gallium/targets/dri-freedreno/Makefile.am
+++ b/src/gallium/targets/dri-freedreno/Makefile.am
@@ -48,10 +48,6 @@ COMMON_LIBADD = \
 	$(LIBDRM_LIBS) \
 	$(FREEDRENO_LIBS)
 
-if HAVE_MESA_LLVM
-COMMON_LIBADD += $(LLVM_LIBS)
-endif
-
 nodist_EXTRA_kgsl_dri_la_SOURCES = dummy.cpp
 kgsl_dri_la_SOURCES = target-kgsl.c
 kgsl_dri_la_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
index bba0886c1fb..c9988e3d1a3 100644
--- a/src/gallium/targets/dri-i915/Makefile.am
+++ b/src/gallium/targets/dri-i915/Makefile.am
@@ -56,7 +56,7 @@ nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp
 
 if HAVE_MESA_LLVM
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
+i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
 
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am
index eafac4915ff..f04119ba801 100644
--- a/src/gallium/targets/dri-ilo/Makefile.am
+++ b/src/gallium/targets/dri-ilo/Makefile.am
@@ -53,8 +53,4 @@ ilo_dri_la_LIBADD = \
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_ilo_dri_la_SOURCES = dummy-cpp.cpp
 
-if HAVE_MESA_LLVM
-ilo_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index f494e1d5fe0..b2a577c4acd 100644
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -52,8 +52,4 @@ nouveau_dri_la_LIBADD = \
 	$(LIBDRM_LIBS) \
 	$(NOUVEAU_LIBS)
 
-if HAVE_MESA_LLVM
-nouveau_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index 26ad3f28698..06eb16aec49 100644
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -58,7 +58,7 @@ nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp
 
 if HAVE_MESA_LLVM
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
+swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
 
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
index d549658f2a6..871dc0d6a26 100644
--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -53,8 +53,4 @@ vmwgfx_dri_la_LINK = $(CXXLINK) $(vmwgfx_dri_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-cpp.cpp
 
-if HAVE_MESA_LLVM
-vmwgfx_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
index 4e6a4e71a27..a95b97c7f92 100644
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -54,8 +54,4 @@ r300_dri_la_LIBADD = \
 	$(GALLIUM_DRI_LIB_DEPS) \
 	$(RADEON_LIBS)
 
-if HAVE_MESA_LLVM
-r300_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index 58178cdffc3..9f7c096ddf7 100644
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -56,8 +56,4 @@ r600_dri_la_LIBADD = \
 
 nodist_EXTRA_r600_dri_la_SOURCES = dummy.cpp
 
-if HAVE_MESA_LLVM
-r600_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
index 8b0cdba51af..1f07595d882 100644
--- a/src/gallium/targets/r600/omx/Makefile.am
+++ b/src/gallium/targets/r600/omx/Makefile.am
@@ -56,7 +56,6 @@ libomx_r600_la_LINK = $(CXXLINK) $(libomx_r600_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_libomx_r600_la_SOURCES = dummy-cpp.cpp
 
-libomx_r600_la_LIBADD += $(LLVM_LIBS)
 else
 libomx_r600_la_LINK = $(LINK) $(libomx_r600_la_LDFLAGS)
 # Mention a dummy pure C file to trigger generation of the $(LINK) variable
diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
index e1e9db4f848..1ff35e0d296 100644
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ b/src/gallium/targets/r600/vdpau/Makefile.am
@@ -48,8 +48,4 @@ libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-cpp.cpp
 
-if HAVE_MESA_LLVM
-libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 53808a61439..55775af72b1 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -47,7 +47,6 @@ libXvMCr600_la_LINK = $(CXXLINK) $(libXvMCr600_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-cpp.cpp
 
-libXvMCr600_la_LIBADD += $(LLVM_LIBS)
 else
 libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)
 # Mention a dummy pure C file to trigger generation of the $(LINK) variable
diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index 03cbd351866..33b5b7f5594 100644
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -54,8 +54,4 @@ radeonsi_dri_la_LIBADD = \
 	$(GALLIUM_DRI_LIB_DEPS) \
 	$(RADEON_LIBS)
 
-if HAVE_MESA_LLVM
-radeonsi_dri_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
index 2fcf5ae3aa1..c2065cf8926 100644
--- a/src/gallium/targets/radeonsi/omx/Makefile.am
+++ b/src/gallium/targets/radeonsi/omx/Makefile.am
@@ -55,5 +55,4 @@ libomx_radeonsi_la_LINK = $(CXXLINK) $(libomx_radeonsi_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_libomx_radeonsi_la_SOURCES = dummy-cpp.cpp
 
-libomx_radeonsi_la_LIBADD += $(LLVM_LIBS)
 endif
diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
index 4457892a127..b8dcf8865df 100644
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
@@ -46,8 +46,4 @@ libvdpau_radeonsi_la_LIBADD = \
 	$(GALLIUM_VDPAU_LIB_DEPS) \
 	$(RADEON_LIBS)
 
-if HAVE_MESA_LLVM
-libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
index c84cdb2edf0..de1adf83619 100644
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -45,8 +45,4 @@ libvdpau_nouveau_la_LIBADD = \
 	$(GALLIUM_VDPAU_LIB_DEPS) \
 	$(NOUVEAU_LIBS)
 
-if HAVE_MESA_LLVM
-libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
-endif
-
 include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 00f5bd051c6..5d72c90e5d4 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -42,7 +42,3 @@ libXvMCnouveau_la_LIBADD = \
 	$(GALLIUM_XVMC_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
 	$(NOUVEAU_LIBS)
-
-if HAVE_MESA_LLVM
-libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
-endif