radeon/llvm: Always build libradeonllvm as static

This library is very small, so there is not much to gain from building
it as a shared library.  Also, when linking statically with LLVM, a
shared libradeonllvm exports LLVM symbols and creates problems when
used with other shared objects that also link statically to LLVM.

Reviewed-by: Mathias.Froehlich@web.de

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 08d7e2ce3411c3d015fb76e8953a17c68d8cfe9a..9203d03292b4412ea531331a462d0a6008e0c6c6 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -29,7 +29,7 @@ if R600_NEED_RADEON_GALLIUM
 libr600_la_SOURCES += \
        $(LLVM_C_SOURCES)
 
-libr600_la_LIBADD += ../radeon/libllvmradeon@VERSION@.la
+libr600_la_LIBADD += ../radeon/libllvmradeon.la
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 32ad32932b00c3ac4938fb30bd772838deabf906..ac8cbd36b2bf825e2b76ec9338c62272b0b6af1e 100644 (file)
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -12,31 +12,24 @@ libradeon_la_SOURCES = \
 
 if NEED_RADEON_LLVM
 
-if HAVE_GALLIUM_R600
-if HAVE_GALLIUM_RADEONSI
-lib_LTLIBRARIES = libllvmradeon@VERSION@.la
-libllvmradeon@VERSION@_la_LDFLAGS = -Wl, -shared -avoid-version \
+libllvmradeon_la_LDFLAGS = \
        $(LLVM_LDFLAGS)
-LIBGALLIUM_LIBS += $(top_builddir)/src/gallium/auxiliary/libgallium.la
-else
-noinst_LTLIBRARIES += libllvmradeon@VERSION@.la
-endif
-else
-noinst_LTLIBRARIES += libllvmradeon@VERSION@.la
-endif
 
-libllvmradeon@VERSION@_la_CXXFLAGS = \
+noinst_LTLIBRARIES += libllvmradeon.la
+
+libllvmradeon_la_CXXFLAGS = \
        $(GALLIUM_CFLAGS) \
        $(DEFINES)
 
-libllvmradeon@VERSION@_la_CFLAGS = \
+libllvmradeon_la_CFLAGS = \
        $(GALLIUM_CFLAGS) \
        $(LLVM_CFLAGS)
 
-libllvmradeon@VERSION@_la_SOURCES = \
+libllvmradeon_la_SOURCES = \
+       $(LLVM_CPP_FILES) \
        $(LLVM_C_FILES)
 
-libllvmradeon@VERSION@_la_LIBADD = \
+libllvmradeon_la_LIBADD = \
        $(LIBGALLIUM_LIBS) \
        $(CLOCK_LIB) \
        $(LLVM_LIBS) \

diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index df2870ee59d2b7d0376859072ba9e7805debba68..46aa998d51283a7cff18cc7d07ca971d762586a6 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -35,4 +35,4 @@ AM_CFLAGS = $(LLVM_CFLAGS)
 libradeonsi_la_SOURCES = $(C_SOURCES)
 libradeonsi_la_LIBADD = \
        ../radeon/libradeon.la \
-       ../radeon/libllvmradeon@VERSION@.la
+       ../radeon/libllvmradeon.la