KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2014-05-10 14:25:08 +01:00
parent 670418740f
commit 6fcc0b0ba5
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/Makefile.am
View File

@ -28,8 +28,6 @@ AM_CFLAGS += \
libr600_la_SOURCES += \ libr600_la_SOURCES += \
$(LLVM_C_SOURCES) $(LLVM_C_SOURCES)
libr600_la_LIBADD += ../radeon/libllvmradeon.la
endif endif
if USE_R600_LLVM_COMPILER if USE_R600_LLVM_COMPILER

12
src/gallium/drivers/radeon/Makefile.am
View File

@ -13,22 +13,18 @@ libradeon_la_SOURCES = \
if NEED_RADEON_LLVM if NEED_RADEON_LLVM
noinst_LTLIBRARIES += libllvmradeon.la AM_CFLAGS += \
libllvmradeon_la_CFLAGS = \
$(GALLIUM_DRIVER_CFLAGS) \
$(RADEON_CFLAGS) \
$(LLVM_CFLAGS) $(LLVM_CFLAGS)
libllvmradeon_la_SOURCES = \ libradeon_la_SOURCES += \
$(LLVM_C_FILES) $(LLVM_C_FILES)
libllvmradeon_la_LIBADD = \ libradeon_la_LIBADD = \
$(CLOCK_LIB) \ $(CLOCK_LIB) \
$(LLVM_LIBS) \ $(LLVM_LIBS) \
$(ELF_LIB) $(ELF_LIB)
libllvmradeon_la_LDFLAGS = \ libradeon_la_LDFLAGS = \
$(LLVM_LDFLAGS) $(LLVM_LDFLAGS)
endif endif

3
src/gallium/drivers/radeonsi/Makefile.am
View File

@ -33,5 +33,4 @@ noinst_LTLIBRARIES = libradeonsi.la
libradeonsi_la_SOURCES = $(C_SOURCES) libradeonsi_la_SOURCES = $(C_SOURCES)
libradeonsi_la_LIBADD = \ libradeonsi_la_LIBADD = \
../radeon/libradeon.la \ ../radeon/libradeon.la
../radeon/libllvmradeon.la