Mesa (master): gallium/radeon: build only a single common library libradeon

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 6fcc0b0ba5b5a554682b782ee5f7930d7aabbe8e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fcc0b0ba5b5a554682b782ee5f7930d7aabbe8e

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sat May 10 14:25:08 2014 +0100

gallium/radeon: build only a single common library libradeon

Just fold libllvmradeon in libradeon.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/drivers/r600/Makefile.am     |    2 --
 src/gallium/drivers/radeon/Makefile.am   |   12 ++++--------
 src/gallium/drivers/radeonsi/Makefile.am |    3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index b2e3708..be8635d 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -28,8 +28,6 @@ AM_CFLAGS += \
 libr600_la_SOURCES += \
 	$(LLVM_C_SOURCES)
 
-libr600_la_LIBADD += ../radeon/libllvmradeon.la
-
 endif
 
 if USE_R600_LLVM_COMPILER
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index b521658..e2c980f 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -13,22 +13,18 @@ libradeon_la_SOURCES = \
 
 if NEED_RADEON_LLVM
 
-noinst_LTLIBRARIES += libllvmradeon.la
-
-libllvmradeon_la_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(RADEON_CFLAGS) \
+AM_CFLAGS += \
 	$(LLVM_CFLAGS)
 
-libllvmradeon_la_SOURCES = \
+libradeon_la_SOURCES += \
 	$(LLVM_C_FILES)
 
-libllvmradeon_la_LIBADD = \
+libradeon_la_LIBADD = \
 	$(CLOCK_LIB) \
 	$(LLVM_LIBS) \
 	$(ELF_LIB)
 
-libllvmradeon_la_LDFLAGS = \
+libradeon_la_LDFLAGS = \
 	$(LLVM_LDFLAGS)
 
 endif
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 84c99f8..f409f7e 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -33,5 +33,4 @@ noinst_LTLIBRARIES = libradeonsi.la
 
 libradeonsi_la_SOURCES = $(C_SOURCES)
 libradeonsi_la_LIBADD = \
-	../radeon/libradeon.la \
-	../radeon/libllvmradeon.la
+	../radeon/libradeon.la