gallium/radeon: build only a single common library libradeon

Just fold libllvmradeon in libradeon.

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

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index b2e37085f2339d460f1906ad482b5b0e0139ca22..be8635d26e24ac0dc63715f4be312d86bc21216f 100644 (file)
--- 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 b521658b02ce2319621d904c188cca1003afc526..e2c980f614e92ad5854546f9012b0b7c06ad59c4 100644 (file)
--- 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 84c99f82f25f5b7e237114821c4e276f5666023b..f409f7e3bc4dec294db4d08d8bc4e1f41399c4b4 100644 (file)
--- 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