diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2021-01-05 13:25:56 +0000 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2021-01-05 14:53:40 +0000 |
| commit | 1038406a8f6609ad0a449746da70393b0835f699 (patch) | |
| tree | 633a10646d1fff39581ac6008535f43f9393ebf0 /libctf/Makefile.am | |
| parent | 37002871ac2111eb3c88f44659c3c67d2fde1997 (diff) | |
| download | binutils-1038406a8f6609ad0a449746da70393b0835f699.zip binutils-1038406a8f6609ad0a449746da70393b0835f699.tar.gz binutils-1038406a8f6609ad0a449746da70393b0835f699.tar.bz2 | |
libctf: rip out BFD_DEPENDENCIES / BFD_LIBADD
This complex morass inherited from libopcodes, which endeavours to
implement the effect of specifying ../bfd/libbfd.la in _LIBADD without
actually doing so, appears to be working around a libtool bug which as
far as I can see is no longer present (i.e., the install directory no
longer appears in -L arguments in libtool link-mode invocations, so
there is no danger of picking up old libbfds or other dependent
libraries).
Replaced with a simple reference to libbfd.la in the appropriate place.
Also adjusted things a little more so that libctf.la and libctf-nobfd.la
are self-contained, even when linking statically. This opens up the
possibility of running libtool to link against libctf from inside the
(upcoming) testsuite.
libctf/ChangeLog
2021-01-05 Nick Alcock <nick.alcock@oracle.com>
* configure.ac (BFD_LIBADD): Remove.
(BFD_DEPENDENCIES): Likewise. Remove associated cases.
(SHARED_LIBADD): Rename to...
(CTF_LIBADD): ... this. Stick in a suitable libiberty even when
linking statically.
* Makefile.am (libctf_nobfd_la_LIBADD): Adjust accordingly.
libctf uses libintl.
(libctf_la_LIBADD): Reference libbfd.la directly, not via
BFD_LIBADD.
(libctf_la_DEPENDENCIES): Remove.
* Makefile.in: Regenerate.
* configure: Likewise.
Diffstat (limited to 'libctf/Makefile.am')
| -rw-r--r-- | libctf/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libctf/Makefile.am b/libctf/Makefile.am index 32a4f5b..a66ccc1 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -39,7 +39,7 @@ include_HEADERS = noinst_LTLIBRARIES = libctf.la libctf-nobfd.la endif -libctf_nobfd_la_LIBADD = @SHARED_LIBADD@ $(ZLIB) +libctf_nobfd_la_LIBADD = @CTF_LIBADD@ $(LIBINTL) $(ZLIB) libctf_nobfd_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@ libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1 libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \ @@ -50,8 +50,7 @@ if NEED_CTF_QSORT_R libctf_nobfd_la_SOURCES += ctf-qsort_r.c endif -libctf_la_LIBADD = @BFD_LIBADD@ $(libctf_nobfd_la_LIBADD) +libctf_la_LIBADD = ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD) libctf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0 -libctf_la_DEPENDENCIES = @BFD_DEPENDENCIES@ libctf_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS) libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c |