From 0dcb9ae0d9366b2ca9520c0c820cc466eb35bf67 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 30 Aug 2012 12:55:29 -0400 Subject: radeon/llvm: Convert to Automake v2: Johannes Obermayr Fix some undefined symbols. v3: Johannes Obermayr Build it -shared to fix egl_gallium.so on r600/radeonsi builds. --- src/gallium/drivers/radeonsi/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/gallium/drivers/radeonsi') 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@VERSION@.la -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 -- cgit v1.2.3