gallium/targets: fold LLVM_LDFLAGS 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 f064a879313d129fa8e3dac5c0315e7f57540cce..d014e275a96e9368808082d8db7c70dcfc95653e 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -108,3 +108,12 @@ GALLIUM_WINSYS_CFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)
+
+if HAVE_MESA_LLVM
+
+GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
+GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS)
+GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
+GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
+
+endif

diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am
index f71fd3267634594f7a9ba78453f8c3f8faeae357..53fce7452452ec0574f8358d0693c0d63a814341 100644 (file)
--- a/src/gallium/targets/dri-freedreno/Makefile.am
+++ b/src/gallium/targets/dri-freedreno/Makefile.am
@@ -49,7 +49,6 @@ COMMON_LIBADD = \
        $(FREEDRENO_LIBS)
 
 if HAVE_MESA_LLVM
-COMMON_LDFLAGS += $(LLVM_LDFLAGS)
 COMMON_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am
index 20f45a29fdd339d9902954fa5fe18cf4829ec503..eafac4915ffdfc71538b8d1f3d680a7a470aaee5 100644 (file)
--- a/src/gallium/targets/dri-ilo/Makefile.am
+++ b/src/gallium/targets/dri-ilo/Makefile.am
@@ -54,7 +54,6 @@ ilo_dri_la_LIBADD = \
 nodist_EXTRA_ilo_dri_la_SOURCES = dummy-cpp.cpp
 
 if HAVE_MESA_LLVM
-ilo_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 ilo_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index d14796e6bf6cc3b62d449a26eaccfa5e2c648077..f494e1d5fe03185ece08ccbdcd88494336a56716 100644 (file)
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -53,7 +53,6 @@ nouveau_dri_la_LIBADD = \
        $(NOUVEAU_LIBS)
 
 if HAVE_MESA_LLVM
-nouveau_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 nouveau_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index e05e99ddeca314b6c11dd93fe51502b8c0ffb9f8..26ad3f28698751d6fd16b8625e5d6a620e92124c 100644 (file)
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -58,7 +58,6 @@ nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp
 
 if HAVE_MESA_LLVM
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-swrast_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
index 85b02da525fc25ffb6338ce53d18b00f144b88a9..d549658f2a6a5d88dfba930133eb632b5963effc 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -54,7 +54,6 @@ vmwgfx_dri_la_LINK = $(CXXLINK) $(vmwgfx_dri_la_LDFLAGS)
 nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-cpp.cpp
 
 if HAVE_MESA_LLVM
-vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 vmwgfx_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
index 1e4fe9d5abd86748363465ebaefb7c51259f4b8c..4e6a4e71a27deede0e18aa5d5b044adac85017d5 100644 (file)
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -55,7 +55,6 @@ r300_dri_la_LIBADD = \
        $(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
-r300_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 r300_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index 6dd344841c2c70ce27d228f2e9aa6d411bf89038..58178cdffc38b3bb66b691db3393c5260830a201 100644 (file)
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -57,7 +57,6 @@ r600_dri_la_LIBADD = \
 nodist_EXTRA_r600_dri_la_SOURCES = dummy.cpp
 
 if HAVE_MESA_LLVM
-r600_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 r600_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
index 0aa469ba035c58a53f4446875dd5cfdab60aee54..8b0cdba51af4cbbfbe857e6dc7586887773645c2 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_LDFLAGS += $(LLVM_LDFLAGS)
 libomx_r600_la_LIBADD += $(LLVM_LIBS)
 else
 libomx_r600_la_LINK = $(LINK) $(libomx_r600_la_LDFLAGS)

diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
index d71bcc52842b1f21eb575cd97bc51ddf63d04e9a..e1e9db4f848f004d596d93dcc896b54fb174f106 100644 (file)
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ b/src/gallium/targets/r600/vdpau/Makefile.am
@@ -49,7 +49,6 @@ libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS)
 nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-cpp.cpp
 
 if HAVE_MESA_LLVM
-libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS)
 libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 6e71ffa7932e548ba9806cb17c5ece7053a85ff3..53808a6143995c10f9b839c98df3ae813059115f 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_LDFLAGS += $(LLVM_LDFLAGS)
 libXvMCr600_la_LIBADD += $(LLVM_LIBS)
 else
 libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)

diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index 32897e0752e4010a106b98793806155de7364373..03cbd351866666e7876bb8fea2c96cdda7a2ffb8 100644 (file)
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -55,7 +55,6 @@ radeonsi_dri_la_LIBADD = \
        $(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
-radeonsi_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 radeonsi_dri_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
index e85eb11378e104909b63cbba58b8eaceae1b6a50..2fcf5ae3aa185fdfb6b9a0c9fa9cdc3a3f4ca089 100644 (file)
--- a/src/gallium/targets/radeonsi/omx/Makefile.am
+++ b/src/gallium/targets/radeonsi/omx/Makefile.am
@@ -55,6 +55,5 @@ 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_LDFLAGS += $(LLVM_LDFLAGS)
 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 fc21e4b8cbd93d2bcb3aac6d9b3935069cec9046..4457892a127deecf444df687377270c41376c5cd 100644 (file)
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
@@ -47,7 +47,6 @@ libvdpau_radeonsi_la_LIBADD = \
        $(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
-libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
 libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
index 7ed06994dea64c39387170d45cdd7777e8aebef8..c84cdb2edf0a7d830b02041219fada89c6197506 100644 (file)
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -46,7 +46,6 @@ libvdpau_nouveau_la_LIBADD = \
        $(NOUVEAU_LIBS)
 
 if HAVE_MESA_LLVM
-libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
 libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
 endif
 

diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 4abf81c12478f0a32dedf0e8207ff65234fa1380..00f5bd051c66a0d6edabd50a21c8d2d05472ff5c 100644 (file)
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -44,6 +44,5 @@ libXvMCnouveau_la_LIBADD = \
        $(NOUVEAU_LIBS)
 
 if HAVE_MESA_LLVM
-libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
 libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
 endif