diff options
Diffstat (limited to 'binutils')
-rw-r--r-- | binutils/Makefile.am | 46 | ||||
-rw-r--r-- | binutils/Makefile.in | 47 | ||||
-rwxr-xr-x | binutils/configure | 6 |
3 files changed, 53 insertions, 46 deletions
diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 4bc6191..ad571b6 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -226,28 +226,30 @@ development.exp: $(BFDDIR)/development.sh installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) -# There's no global DEPENDENCIES. So, we must explicitly list everything. -size_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -objdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME) -nm_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -ar_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -strings_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -strip_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -ranlib_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -cxxfilt_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -objcopy_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -srconv_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -sysdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -coffdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -dlltool_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -windres_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -windmc_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -addr2line_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -readelf_DEPENDENCIES = $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME) -elfedit_DEPENDENCIES = $(LIBIBERTY) -dllwrap_DEPENDENCIES = $(LIBIBERTY) -bfdtest1_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -bfdtest2_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) +# There's no global DEPENDENCIES. So, we must explicitly list everything +# which depends on libintl, since we don't know whether LIBINTL_DEP will be +# non-empty until configure time. Ugh! +size_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +objdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME) +nm_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +ar_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +strings_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +ranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +objcopy_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +dlltool_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +readelf_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME) +elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) +dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) +bfdtest1_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +bfdtest2_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 2b8961a..67fa5b3 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -528,6 +528,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -766,28 +767,30 @@ CC_FOR_TARGET = ` \ fi` -# There's no global DEPENDENCIES. So, we must explicitly list everything. -size_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -objdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME) -nm_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -ar_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -strings_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -strip_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -ranlib_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -cxxfilt_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -objcopy_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -srconv_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -sysdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -coffdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -dlltool_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -windres_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -windmc_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -addr2line_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -readelf_DEPENDENCIES = $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME) -elfedit_DEPENDENCIES = $(LIBIBERTY) -dllwrap_DEPENDENCIES = $(LIBIBERTY) -bfdtest1_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) -bfdtest2_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) +# There's no global DEPENDENCIES. So, we must explicitly list everything +# which depends on libintl, since we don't know whether LIBINTL_DEP will be +# non-empty until configure time. Ugh! +size_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +objdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME) +nm_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +ar_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +strings_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +ranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +objcopy_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +dlltool_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +readelf_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME) +elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) +dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) +bfdtest1_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +bfdtest2_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) size_SOURCES = size.c $(BULIBS) objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS) diff --git a/binutils/configure b/binutils/configure index 3d72573..c948b85 100755 --- a/binutils/configure +++ b/binutils/configure @@ -668,6 +668,7 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL +LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11080,7 +11081,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11083 "configure" +#line 11084 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11186,7 +11187,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11189 "configure" +#line 11190 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14614,6 +14615,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } if test x"$USE_NLS" != xyes; then |