gallium/targets: fold LLVM_LDFLAGS inside Automake.inc

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2014-03-11 02:21:21 +00:00
parent 1ea1767f72
commit 2328900f66
16 changed files with 9 additions and 15 deletions

View file

@ -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

View file

@ -49,7 +49,6 @@ COMMON_LIBADD = \
$(FREEDRENO_LIBS)
if HAVE_MESA_LLVM
COMMON_LDFLAGS += $(LLVM_LDFLAGS)
COMMON_LIBADD += $(LLVM_LIBS)
endif

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -44,6 +44,5 @@ libXvMCnouveau_la_LIBADD = \
$(NOUVEAU_LIBS)
if HAVE_MESA_LLVM
libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
endif