[PATCH] libebl: Don't install libebl.a, libebl.h and remove backends from spec.

[Mark Wielaard]

All archive members from libebl.a are now in libdw.a. We don't generate
separate backend shared libraries anymore. So remove them from the
elfutils.spec file.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 config/ChangeLog        |  7 +++++++
 config/elfutils.spec.in | 10 ++--------
 libebl/ChangeLog        |  5 +++++
 libebl/Makefile.am      |  7 ++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index a7e98d77..b641d0d5 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,10 @@
+2019-08-29  Mark Wielaard  <mark@klomp.org>
+
+	* elfutils.spec.in (%description devel): Remove libebl text.
+	(%install): Don't touch backend lib.*.so* files.
+	(%files): Remove backends dir and so files.
+	(%files devel): Remove libebl.h and libebl.a
+
 2019-08-28  Mark Wielaard  <mark@klomp.org>
 
 	* elfutils.spec.in (License): Add GFDL.
diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index 513c4e79..6771d13b 100644
--- a/config/elfutils.spec.in
+++ b/config/elfutils.spec.in
@@ -51,9 +51,8 @@ Requires: elfutils-libelf-devel = %{version}-%{release}
 
 %description devel
 The elfutils-devel package contains the libraries to create
-applications for handling compiled objects.  libebl provides some
-higher-level ELF access functionality.  libdw provides access to
-the DWARF debugging information.  libasm provides a programmable
+applications for handling compiled objects.  libdw provides access
+to the DWARF debugging information.  libasm provides a programmable
 assembler interface.
 
 %package devel-static
@@ -131,7 +130,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
 %makeinstall
 
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
-chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
 
 # XXX Nuke unpackaged files
 ( cd ${RPM_BUILD_ROOT}
@@ -184,8 +182,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdw-%{version}.so
 %{_libdir}/libasm.so.*
 %{_libdir}/libdw.so.*
-%dir %{_libdir}/elfutils
-%{_libdir}/elfutils/lib*.so
 %{_mandir}/man1/eu-*.1*
 
 %files devel
@@ -195,12 +191,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/elfutils/elf-knowledge.h
 %{_includedir}/elfutils/known-dwarf.h
 #%{_includedir}/elfutils/libasm.h
-%{_includedir}/elfutils/libebl.h
 %{_includedir}/elfutils/libdw.h
 %{_includedir}/elfutils/libdwfl.h
 %{_includedir}/elfutils/libdwelf.h
 %{_includedir}/elfutils/version.h
-%{_libdir}/libebl.a
 #%{_libdir}/libasm.so
 %{_libdir}/libdw.so
 %{_libdir}/pkgconfig/libdw.pc
diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index 6ba3a02b..4da7eeeb 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-29  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile.am (noinst_LIBRARIES): Add libebl.a.
+	(noinst_HEADERS): Add libebl.h.
+
 2019-07-05  Omar Sandoval  <osandov@fb.com>
 
 	* Makefile.am: Make libebl.a non-PIC by default.
diff --git a/libebl/Makefile.am b/libebl/Makefile.am
index 8af84633..d0d475b8 100644
--- a/libebl/Makefile.am
+++ b/libebl/Makefile.am
@@ -34,10 +34,7 @@ endif
 AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw -I$(srcdir)/../libasm
 VERSION = 1
 
-lib_LIBRARIES = libebl.a
-noinst_LIBRARIES = libebl_pic.a
-
-pkginclude_HEADERS = libebl.h
+noinst_LIBRARIES = libebl.a libebl_pic.a
 
 libebl_a_SOURCES = eblopenbackend.c eblclosebackend.c eblreloctypename.c \
 		   eblsegmenttypename.c eblsectiontypename.c \
@@ -62,6 +59,6 @@ libebl_a_SOURCES = eblopenbackend.c eblclosebackend.c eblreloctypename.c \
 libebl_pic_a_SOURCES =
 am_libebl_pic_a_OBJECTS = $(libebl_a_SOURCES:.c=.os)
 
-noinst_HEADERS = libeblP.h ebl-hooks.h
+noinst_HEADERS = libebl.h libeblP.h ebl-hooks.h
 
 MOSTLYCLEANFILES = $(am_libebl_pic_a_OBJECTS)
-- 
2.18.1