radeon: automake: remove unneeded elf Cflags/Libs

No longer required as of commit d90bf4ef3e1 ("radeon: remove unused
radeon_elf_util.{c,h}")

v2: Add the required libelf link in src/amd/Makefile.common.am

Fixes: d90bf4ef3e1 ("radeon: remove unused  radeon_elf_util.{c,h}")
Cc: Timothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 595876f610aa04e80d8fb49b1d030625aff47f2f..83f148b805199bb963f2ac4f35ef3531b86f93ad 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -65,6 +65,8 @@ common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
 endif
 endif
 
+common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
+
 common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
        $(AM_V_at)$(MKDIR_P) $(@D)
        $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 57e31f751b385affd6b6dd5ef90107643f23cec8..2be6af4b1550524708b1a1ab1d7a1e71e5f841fb 100644 (file)
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -16,13 +16,11 @@ libradeon_la_SOURCES = \
 if HAVE_GALLIUM_LLVM
 
 AM_CFLAGS += \
-       $(LLVM_CFLAGS) \
-       $(LIBELF_CFLAGS)
+       $(LLVM_CFLAGS)
 
 libradeon_la_LIBADD = \
        $(CLOCK_LIB) \
-       $(LLVM_LIBS) \
-       $(LIBELF_LIBS)
+       $(LLVM_LIBS)
 
 libradeon_la_LDFLAGS = \
        $(LLVM_LDFLAGS)