diff options
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/binutils/binutils/Makefile.in | 40 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/gas/Makefile.in | 9 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/gprof/Makefile.in | 4 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ld/Makefile.in | 2 |
4 files changed, 26 insertions, 29 deletions
diff --git a/gnu/usr.bin/binutils/binutils/Makefile.in b/gnu/usr.bin/binutils/binutils/Makefile.in index 8172759603a..495d53e5cce 100644 --- a/gnu/usr.bin/binutils/binutils/Makefile.in +++ b/gnu/usr.bin/binutils/binutils/Makefile.in @@ -204,7 +204,7 @@ BFDLIB = ../bfd/libbfd.la OPCODES = ../opcodes/libopcodes.la -LIBIBERTY = ../libiberty/libiberty.a +LIBIBERTY = -liberty POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES) @@ -316,76 +316,74 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ nlmconv_OBJECTS = nlmconv.o nlmheader.o bucomm.o version.o filemode.o nlmconv_LDADD = $(LDADD) -nlmconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +nlmconv_DEPENDENCIES = ../bfd/libbfd.la nlmconv_LDFLAGS = srconv_OBJECTS = srconv.o coffgrok.o bucomm.o version.o filemode.o srconv_LDADD = $(LDADD) -srconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +srconv_DEPENDENCIES = ../bfd/libbfd.la srconv_LDFLAGS = sysdump_OBJECTS = sysdump.o bucomm.o version.o filemode.o sysdump_LDADD = $(LDADD) -sysdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +sysdump_DEPENDENCIES = ../bfd/libbfd.la sysdump_LDFLAGS = coffdump_OBJECTS = coffdump.o coffgrok.o bucomm.o version.o filemode.o coffdump_LDADD = $(LDADD) -coffdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +coffdump_DEPENDENCIES = ../bfd/libbfd.la coffdump_LDFLAGS = dlltool_OBJECTS = dlltool.o defparse.o deflex.o dyn-string.o bucomm.o \ version.o filemode.o -dlltool_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +dlltool_DEPENDENCIES = ../bfd/libbfd.la dlltool_LDFLAGS = windres_OBJECTS = windres.o resrc.o rescoff.o resbin.o rcparse.o \ rclex.o winduni.o resres.o bucomm.o version.o filemode.o -windres_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +windres_DEPENDENCIES = ../bfd/libbfd.la windres_LDFLAGS = dllwrap_OBJECTS = dllwrap.o dyn-string.o version.o -dllwrap_DEPENDENCIES = ../libiberty/libiberty.a +dllwrap_DEPENDENCIES = dllwrap_LDFLAGS = size_OBJECTS = size.o bucomm.o version.o filemode.o size_LDADD = $(LDADD) -size_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +size_DEPENDENCIES = ../bfd/libbfd.la size_LDFLAGS = objdump_OBJECTS = objdump.o prdbg.o rddbg.o debug.o stabs.o ieee.o \ rdcoff.o bucomm.o version.o filemode.o -objdump_DEPENDENCIES = ../opcodes/libopcodes.la ../bfd/libbfd.la \ -../libiberty/libiberty.a +objdump_DEPENDENCIES = ../opcodes/libopcodes.la ../bfd/libbfd.la objdump_LDFLAGS = ar_OBJECTS = arparse.o arlex.o ar.o not-ranlib.o arsup.o rename.o \ bucomm.o version.o filemode.o -ar_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +ar_DEPENDENCIES = ../bfd/libbfd.la ar_LDFLAGS = strings_OBJECTS = strings.o bucomm.o version.o filemode.o strings_LDADD = $(LDADD) -strings_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +strings_DEPENDENCIES = ../bfd/libbfd.la strings_LDFLAGS = ranlib_OBJECTS = ar.o is-ranlib.o arparse.o arlex.o arsup.o rename.o \ bucomm.o version.o filemode.o -ranlib_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +ranlib_DEPENDENCIES = ../bfd/libbfd.la ranlib_LDFLAGS = objcopy_OBJECTS = objcopy.o not-strip.o rename.o rddbg.o debug.o \ stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o objcopy_LDADD = $(LDADD) -objcopy_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +objcopy_DEPENDENCIES = ../bfd/libbfd.la objcopy_LDFLAGS = addr2line_OBJECTS = addr2line.o bucomm.o version.o filemode.o addr2line_LDADD = $(LDADD) -addr2line_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +addr2line_DEPENDENCIES = ../bfd/libbfd.la addr2line_LDFLAGS = readelf_OBJECTS = readelf.o version.o -readelf_DEPENDENCIES = ../libiberty/libiberty.a +readelf_DEPENDENCIES = readelf_LDFLAGS = nm_new_OBJECTS = nm.o bucomm.o version.o filemode.o nm_new_LDADD = $(LDADD) -nm_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +nm_new_DEPENDENCIES = ../bfd/libbfd.la nm_new_LDFLAGS = strip_new_OBJECTS = objcopy.o is-strip.o rename.o rddbg.o debug.o \ stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o strip_new_LDADD = $(LDADD) -strip_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a +strip_new_DEPENDENCIES = ../bfd/libbfd.la strip_new_LDFLAGS = cxxfilt_OBJECTS = -cxxfilt_DEPENDENCIES = cplus-dem.o underscore.o \ -../libiberty/libiberty.a +cxxfilt_DEPENDENCIES = cplus-dem.o underscore.o cxxfilt_LDFLAGS = LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEXLIB = @LEXLIB@ diff --git a/gnu/usr.bin/binutils/gas/Makefile.in b/gnu/usr.bin/binutils/gas/Makefile.in index 569b98eb535..f0aa92342b7 100644 --- a/gnu/usr.bin/binutils/gas/Makefile.in +++ b/gnu/usr.bin/binutils/gas/Makefile.in @@ -537,7 +537,7 @@ DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config - # How to link with both our special library facilities # and the system's installed libraries. -GASLIBS = @OPCODES_LIB@ @BFDLIB@ ../libiberty/libiberty.a +GASLIBS = @OPCODES_LIB@ @BFDLIB@ -liberty # Files to be copied away after each stage in building. STAGESTUFF = *.o $(noinst_PROGRAMS) @@ -551,8 +551,8 @@ as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ gasp_new_SOURCES = gasp.c macro.c sb.c hash.c -gasp_new_LDADD = ../libiberty/libiberty.a $(INTLLIBS) -gasp_new_DEPENDENCIES = ../libiberty/libiberty.a $(INTLDEPS) +gasp_new_LDADD = -liberty $(INTLLIBS) +gasp_new_DEPENDENCIES = $(INTLDEPS) EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \ echo $${rootme}/../expect/expect ; \ @@ -1792,8 +1792,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ itbl_test_OBJECTS = itbl-parse.o itbl-lex.o -itbl_test_DEPENDENCIES = itbl-tops.o itbl-test.o \ -../libiberty/libiberty.a +itbl_test_DEPENDENCIES = itbl-tops.o itbl-test.o itbl_test_LDFLAGS = as_new_OBJECTS = app.o as.o atof-generic.o bignum-copy.o cond.o \ depend.o dwarf2dbg.o ecoff.o ehopt.o expr.o flonum-copy.o \ diff --git a/gnu/usr.bin/binutils/gprof/Makefile.in b/gnu/usr.bin/binutils/gprof/Makefile.in index 3d4187a5e33..919b4cae2bc 100644 --- a/gnu/usr.bin/binutils/gprof/Makefile.in +++ b/gnu/usr.bin/binutils/gprof/Makefile.in @@ -117,8 +117,8 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ i386.c alpha.c vax.c tahoe.c sparc.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c -gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS) -gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLLIBS) +gprof_DEPENDENCIES = ../bfd/libbfd.la $(INTLDEPS) +gprof_LDADD = ../bfd/libbfd.la -liberty $(INTLLIBS) noinst_HEADERS = \ basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \ diff --git a/gnu/usr.bin/binutils/ld/Makefile.in b/gnu/usr.bin/binutils/ld/Makefile.in index 6f95ee5f6ec..15e84084936 100644 --- a/gnu/usr.bin/binutils/ld/Makefile.in +++ b/gnu/usr.bin/binutils/ld/Makefile.in @@ -196,7 +196,7 @@ man_MANS = ld.1 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(prefix)/share/locale\"" BFDLIB = ../bfd/libbfd.la -LIBIBERTY = ../libiberty/libiberty.a +LIBIBERTY = -liberty ALL_EMULATIONS = \ ea29k.o \ |