From 6fcc0b0ba5b5a554682b782ee5f7930d7aabbe8e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 10 May 2014 14:25:08 +0100 Subject: [PATCH] gallium/radeon: build only a single common library libradeon Just fold libllvmradeon in libradeon. Signed-off-by: Emil Velikov Reviewed-by: Tom Stellard --- 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 b2e37085f23..be8635d26e2 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 b521658b02c..e2c980f614e 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 84c99f82f25..f409f7e3bc4 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 -- 2.30.2