diff options
| author | Daniel Jacobowitz <drow@false.org> | 2004-01-07 18:39:40 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2004-01-07 18:39:40 +0000 |
| commit | 3ba7a1aacf862e6e18e1c148dd896530ab0f24e9 (patch) | |
| tree | 9b2f52512eb2c26373a8f327c6d2a0b653706979 /opcodes/Makefile.am | |
| parent | 60ad077b5afe8ae6b1ceed0baf0ae2ecc7aa0e14 (diff) | |
| download | gdb-3ba7a1aacf862e6e18e1c148dd896530ab0f24e9.zip gdb-3ba7a1aacf862e6e18e1c148dd896530ab0f24e9.tar.gz gdb-3ba7a1aacf862e6e18e1c148dd896530ab0f24e9.tar.bz2 | |
* Makefile.am (libopcodes_la_DEPENDENCIES)
(libopcodes_la_LIBADD): Revert 2003-05-17 change. Add explanatory
comment about the problem.
* Makefile.in: Regenerate.
Diffstat (limited to 'opcodes/Makefile.am')
| -rw-r--r-- | opcodes/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index e227b1f..ea621f2 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -283,8 +283,13 @@ disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $(srcdir)/disassemble.c libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c -libopcodes_la_DEPENDENCIES = $(OFILES) ../bfd/libbfd.la -libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ ../bfd/libbfd.la +# It's desirable to list ../bfd/libbfd.la in DEPENDENCIES and LIBADD. +# Unfortunately this causes libtool to add -L$(libdir), referring to the +# planned install directory of libbfd. This can cause us to pick up an +# old version of libbfd, or to pick up libbfd for the wrong architecture +# if host != build. +libopcodes_la_DEPENDENCIES = $(OFILES) +libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ # libtool will build .libs/libopcodes.a. We create libopcodes.a in |