From 7dac1b470a9c1c977f79ecc301407681e200bd1a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 1 Nov 2013 18:58:27 +0000 Subject: gallium/drivers: compact compiler flags into Automake.inc * minimise flags duplication * distingush between VISIBILITY C and CXX flags * set only required flags - C and/or CXX v2: add LLVM_CFLAGS back to AM_CFLAGS (add missing backslash) Signed-off-by: Emil Velikov --- src/gallium/drivers/radeon/Makefile.am | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gallium/drivers/radeon/Makefile.am') diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index a54a3aa97c7..457fee92cc7 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -1,29 +1,26 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc -noinst_LTLIBRARIES = libradeon.la -AM_CFLAGS = $(GALLIUM_CFLAGS) $(RADEON_CFLAGS) $(VISIBILITY_CFLAGS) +AM_CFLAGS = \ + $(GALLIUM_DRIVER_CFLAGS) \ + $(RADEON_CFLAGS) + +noinst_LTLIBRARIES = libradeon.la libradeon_la_SOURCES = \ $(C_SOURCES) if NEED_RADEON_LLVM -libllvmradeon_la_LDFLAGS = \ - $(LLVM_LDFLAGS) - noinst_LTLIBRARIES += libllvmradeon.la libllvmradeon_la_CXXFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) + $(GALLIUM_DRIVER_CXXFLAGS) libllvmradeon_la_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(LLVM_CFLAGS) \ - $(VISIBILITY_CFLAGS) + $(GALLIUM_DRIVER_CFLAGS) \ + $(LLVM_CFLAGS) libllvmradeon_la_SOURCES = \ $(LLVM_CPP_FILES) \ @@ -34,4 +31,7 @@ libllvmradeon_la_LIBADD = \ $(LLVM_LIBS) \ $(ELF_LIB) +libllvmradeon_la_LDFLAGS = \ + $(LLVM_LDFLAGS) + endif -- cgit v1.2.3