Mesa (master): radeon: automake: remove unneeded elf Cflags/Libs

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 88b8aaea3b172d4a0224bcadf5f12e2ae6119a0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=88b8aaea3b172d4a0224bcadf5f12e2ae6119a0c

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu May  4 16:17:28 2017 +0100

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 at itsqueeze.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com> (v1)

---

 src/amd/Makefile.common.am             | 2 ++
 src/gallium/drivers/radeon/Makefile.am | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 595876f610..83f148b805 100644
--- 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 57e31f751b..2be6af4b15 100644
--- 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)