gallium/targets: move LLVM_LIBS handling inside Automake.inc

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index d014e275a96e9368808082d8db7c70dcfc95653e..a8981fb11d5d8b4d46a92c0b5337e04793a42259 100644 (file)
--- 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 53fce7452452ec0574f8358d0693c0d63a814341..6347a552f077d4dad13995a060fffc149df13654 100644 (file)
--- 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 bba0886c1fb53502eb68b62e8f4b7b8c82c10781..c9988e3d1a3cf9b333547727ece82c3db5186663 100644 (file)
--- 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 eafac4915ffdfc71538b8d1f3d680a7a470aaee5..f04119ba8014312105ae2d25fa0b0a83954e2d3d 100644 (file)
--- 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 f494e1d5fe03185ece08ccbdcd88494336a56716..b2a577c4acda7b13e1a480a422e5cd9e6af341a8 100644 (file)
--- 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 26ad3f28698751d6fd16b8625e5d6a620e92124c..06eb16aec49dfadb4664ccac7a5ae7488c8777ae 100644 (file)
--- 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 d549658f2a6a5d88dfba930133eb632b5963effc..871dc0d6a26e3b567c3071424b5589dee0a159ca 100644 (file)
--- 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 4e6a4e71a27deede0e18aa5d5b044adac85017d5..a95b97c7f9285ecfb36b84e1a5506c705575255c 100644 (file)
--- 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 58178cdffc38b3bb66b691db3393c5260830a201..9f7c096ddf796cb7d68e8c6403cda3d1e77895a8 100644 (file)
--- 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 8b0cdba51af4cbbfbe857e6dc7586887773645c2..1f07595d8828ecd075c713382b86f0d3a49623c7 100644 (file)
--- 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 e1e9db4f848f004d596d93dcc896b54fb174f106..1ff35e0d2960834cb2d01f1f50af6fb49bdb7d7e 100644 (file)
--- 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 53808a6143995c10f9b839c98df3ae813059115f..55775af72b1a18f5124187a295a5252013e43c05 100644 (file)
--- 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 03cbd351866666e7876bb8fea2c96cdda7a2ffb8..33b5b7f5594fbe05f883df8c24afc3f4012089a9 100644 (file)
--- 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 2fcf5ae3aa185fdfb6b9a0c9fa9cdc3a3f4ca089..c2065cf892678fb31961f782d1ed11da3ef1432d 100644 (file)
--- 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 4457892a127deecf444df687377270c41376c5cd..b8dcf8865dfc7a58c222416aebdd3c535213c0c0 100644 (file)
--- 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 c84cdb2edf0a7d830b02041219fada89c6197506..de1adf8361904a78b9b0f3ec8e77527fed175a0c 100644 (file)
--- 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 00f5bd051c66a0d6edabd50a21c8d2d05472ff5c..5d72c90e5d4afcfaf610eded2da6945feda23523 100644 (file)
--- 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