From 2328900f66b4b1d682d79deeb4b66249991c4e89 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 11 Mar 2014 02:21:21 +0000 Subject: [PATCH] gallium/targets: fold LLVM_LDFLAGS inside Automake.inc Signed-off-by: Emil Velikov --- src/gallium/Automake.inc | 9 +++++++++ src/gallium/targets/dri-freedreno/Makefile.am | 1 - src/gallium/targets/dri-ilo/Makefile.am | 1 - src/gallium/targets/dri-nouveau/Makefile.am | 1 - src/gallium/targets/dri-swrast/Makefile.am | 1 - src/gallium/targets/dri-vmwgfx/Makefile.am | 1 - src/gallium/targets/r300/dri/Makefile.am | 1 - src/gallium/targets/r600/dri/Makefile.am | 1 - src/gallium/targets/r600/omx/Makefile.am | 1 - src/gallium/targets/r600/vdpau/Makefile.am | 1 - src/gallium/targets/r600/xvmc/Makefile.am | 1 - src/gallium/targets/radeonsi/dri/Makefile.am | 1 - src/gallium/targets/radeonsi/omx/Makefile.am | 1 - src/gallium/targets/radeonsi/vdpau/Makefile.am | 1 - src/gallium/targets/vdpau-nouveau/Makefile.am | 1 - src/gallium/targets/xvmc-nouveau/Makefile.am | 1 - 16 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index f064a879313..d014e275a96 100644 --- 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 f71fd326763..53fce745245 100644 --- 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 20f45a29fdd..eafac4915ff 100644 --- 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 d14796e6bf6..f494e1d5fe0 100644 --- 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 e05e99ddeca..26ad3f28698 100644 --- 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 85b02da525f..d549658f2a6 100644 --- 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 1e4fe9d5abd..4e6a4e71a27 100644 --- 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 6dd344841c2..58178cdffc3 100644 --- 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 0aa469ba035..8b0cdba51af 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_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 d71bcc52842..e1e9db4f848 100644 --- 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 6e71ffa7932..53808a61439 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_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 32897e0752e..03cbd351866 100644 --- 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 e85eb11378e..2fcf5ae3aa1 100644 --- 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 fc21e4b8cbd..4457892a127 100644 --- 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 7ed06994dea..c84cdb2edf0 100644 --- 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 4abf81c1247..00f5bd051c6 100644 --- 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 -- 2.30.2