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.in | |
| 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.in')
| -rw-r--r-- | opcodes/Makefile.in | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index de427ea..559194d 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -393,8 +393,13 @@ OFILES = @BFD_MACHINES@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl 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 @@ -617,7 +622,7 @@ maintainer-clean-recursive: dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ |