summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2012-08-30 12:55:29 -0400
committerAndreas Boll <[email protected]>2013-01-10 22:01:08 +0100
commit0dcb9ae0d9366b2ca9520c0c820cc466eb35bf67 (patch)
treeda9142dcbd68abc75296bc2c28e2f49bd700a34b /src/gallium/drivers/radeonsi
parent2cbb94b3ce012a2caf9e6ab10d69bf85d7222c27 (diff)
radeon/llvm: Convert to Automake
v2: Johannes Obermayr <[email protected]> Fix some undefined symbols. v3: Johannes Obermayr <[email protected]> Build it -shared to fix egl_gallium.so on r600/radeonsi builds.
Diffstat (limited to 'src/gallium/drivers/radeonsi')
-rw-r--r--src/gallium/drivers/radeonsi/Makefile.am13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 7906fb6aa5f..595cf862744 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -23,7 +23,7 @@
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
-noinst_LIBRARIES = libradeonsi.a
+noinst_LTLIBRARIES = libradeonsi.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/drivers/radeon \
@@ -32,10 +32,9 @@ AM_CPPFLAGS = \
$(GALLIUM_CFLAGS)
AM_CFLAGS = $(LLVM_CFLAGS)
-# This is a hack until we can move the backend into the LLVM project.
-# We need to use mklib, because it splits up libradeon.a into object files
-# so that we can link it with the radeonsi objects.
-libradeonsi_a_AR = $(top_srcdir)/bin/mklib -o radeonsi -static
+libradeonsi_la_SOURCES = $(C_SOURCES)
+libradeonsi_la_LIBADD = ../radeon/libllvmradeon@[email protected]
-libradeonsi_a_SOURCES = $(C_SOURCES)
-libradeonsi_a_LIBADD = ../radeon/libradeon.a
+#XXX: Delete this when all radeonsi targets are converted to automake.
+all-local: libradeonsi.la
+ ln -f $(builddir)/.libs/libradeonsi.a $(builddir)/libradeonsi.a