From e874cbd3879843a83e4bcc4b54cd7107387b1df6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 20 Jun 2024 09:05:27 +0930 Subject: Remove LIBINTL_DEP The intl directory in the source no longer exists. LIBINTL_DEP is thus always empty. Remove references to it. config/ * gettext-sister.m4: Don't AC_SUBST LIBINTL_DEP. bfd/ * Makefile.in: Regenerate. * configure: Regenerate. binutils/ * Makefile.am (*_DEPENDENCIES): Remove LIBINTL_DEP. * Makefile.in: Regenerate. * configure: Regenerate. gas/ * Makefile.am (as_new_DEPENDENCIES): Remove LIBINTL_DEP. * Makefile.in: Regenerate. * configure: Regenerate. gdb/ * Makefile.in (INTL_DEPS): Don't set or reference. * configure: Regenerate. gdbserver/ * Makefile.in (INTL_DEPS): Don't set or reference. gdbsupport/ * Makefile.in: Regenerate. * configure: Regenerate. gold/ * Makefile.am (deps_var): Remove LIBINTL_DEP. (incremental_dump_DEPENDENCIES, dwp_DEPENDENCIES): Likewise. * Makefile.in: Regenerate. * configure: Regenerate. * testsuite/Makefile.am (DEPENDENCIES): Remove LIBINTL_DEP. * testsuite/Makefile.in: Regenerate. gprof/ * Makefile.am (gprof_DEPENDENCIES): Remove LIBINTL_DEP. * Makefile.in: Regenerate. * configure: Regenerate. ld/ * Makefile.am (ld_new_DEPENDENCIES): Remove LIBINTL_DEP. * Makefile.in: Regenerate. * configure: Regenerate. libctf/ * Makefile.in: Regenerate. * configure: Regenerate. opcodes/ * configure.ac (BUILD_LIBS): Remove LIBINTL. (BUILD_LIB_DEPS): Remove LIBINTL_DEP. * Makefile.in: Regenerate. * configure: Regenerate. --- bfd/Makefile.in | 1 - bfd/configure | 6 ++---- binutils/Makefile.am | 46 ++++++++++++++++++++++----------------------- binutils/Makefile.in | 47 ++++++++++++++++++++++------------------------ binutils/configure | 6 ++---- config/gettext-sister.m4 | 1 - gas/Makefile.am | 2 +- gas/Makefile.in | 3 +-- gas/configure | 6 ++---- gdb/Makefile.in | 3 +-- gdb/configure | 6 ++---- gdbserver/Makefile.in | 5 ++--- gdbsupport/Makefile.in | 1 - gdbsupport/configure | 2 -- gold/Makefile.am | 7 +++---- gold/Makefile.in | 9 +++------ gold/configure | 2 -- gold/testsuite/Makefile.am | 2 +- gold/testsuite/Makefile.in | 3 +-- gprof/Makefile.am | 2 +- gprof/Makefile.in | 3 +-- gprof/configure | 6 ++---- ld/Makefile.am | 2 +- ld/Makefile.in | 3 +-- ld/configure | 6 ++---- libctf/Makefile.in | 1 - libctf/configure | 6 ++---- opcodes/Makefile.in | 1 - opcodes/configure | 8 ++------ opcodes/configure.ac | 2 -- 30 files changed, 77 insertions(+), 121 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index b3d97d4..54f6a54 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -367,7 +367,6 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/bfd/configure b/bfd/configure index 6458974..d65a73f 100755 --- a/bfd/configure +++ b/bfd/configure @@ -669,7 +669,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11155,7 +11154,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11158 "configure" +#line 11157 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11261,7 +11260,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11264 "configure" +#line 11263 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14551,7 +14550,6 @@ 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 diff --git a/binutils/Makefile.am b/binutils/Makefile.am index ad571b6..4bc6191 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -226,30 +226,28 @@ development.exp: $(BFDDIR)/development.sh installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) -# 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) +# 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) LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 67fa5b3..2b8961a 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -528,7 +528,6 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -767,30 +766,28 @@ CC_FOR_TARGET = ` \ fi` -# 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) +# 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) 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 c948b85..3d72573 100755 --- a/binutils/configure +++ b/binutils/configure @@ -668,7 +668,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11081,7 +11080,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11084 "configure" +#line 11083 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11187,7 +11186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11190 "configure" +#line 11189 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14615,7 +14614,6 @@ 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 diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4 index 5bb385f..960bf87 100644 --- a/config/gettext-sister.m4 +++ b/config/gettext-sister.m4 @@ -28,7 +28,6 @@ m4_popdef([gettext_builddir]) AC_SUBST([USE_NLS]) AC_SUBST([LIBINTL]) -AC_SUBST([LIBINTL_DEP]) AC_SUBST([INCINTL]) AC_SUBST([XGETTEXT]) AC_SUBST([GMSGFMT]) diff --git a/gas/Makefile.am b/gas/Makefile.am index b9b9e18..e8c4202 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -422,7 +422,7 @@ as_new_SOURCES = $(GAS_CFILES) as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) $(ZSTD_LIBS) as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ - $(extra_objects) $(GASLIBS) $(LIBINTL_DEP) + $(extra_objects) $(GASLIBS) EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \ $(TARGET_CPU_HFILES) $(TARGET_EXTRA_FILES) $(TARG_ENV_CFILES) \ $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) \ diff --git a/gas/Makefile.in b/gas/Makefile.in index b575163..274704b 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -413,7 +413,6 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -911,7 +910,7 @@ as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) $(ZSTD_LIBS) as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ - $(extra_objects) $(GASLIBS) $(LIBINTL_DEP) + $(extra_objects) $(GASLIBS) # The LoongArch lexical analyzer and parser. diff --git a/gas/configure b/gas/configure index 0cebc4e..3942fcb 100755 --- a/gas/configure +++ b/gas/configure @@ -653,7 +653,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -10775,7 +10774,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10778 "configure" +#line 10777 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10881,7 +10880,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10884 "configure" +#line 10883 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15138,7 +15137,6 @@ 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 diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 6f7f2af..0429a99 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -234,7 +234,6 @@ RDYNAMIC = @RDYNAMIC@ # Where is the INTL library? Typically in ../intl. INTL = @LIBINTL@ -INTL_DEPS = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ # Where is the ICONV library? This will be empty if in libc or not available. @@ -682,7 +681,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \ $(GMPLIBS) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB) CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ - $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ + $(OPCODES) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ $(LIBSUPPORT) DIST = gdb diff --git a/gdb/configure b/gdb/configure index 15ececf..86b25ac 100755 --- a/gdb/configure +++ b/gdb/configure @@ -775,7 +775,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11499,7 +11498,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11502 "configure" +#line 11501 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11605,7 +11604,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11608 "configure" +#line 11607 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -24507,7 +24506,6 @@ 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 diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 6148ccf..05a52f5 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -114,7 +114,6 @@ include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc # Where is the INTL library? Typically in ../intl. INTL = @LIBINTL@ -INTL_DEPS = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ INCSUPPORT = \ @@ -367,7 +366,7 @@ install-html: clean-info: gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ - $(INTL_DEPS) $(GDBSUPPORT) + $(GDBSUPPORT) $(SILENCE) rm -f gdbserver$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ $(CXXFLAGS) \ @@ -376,7 +375,7 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ $(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) $(MAYBE_LIBICONV) gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ - $(INTL_DEPS) $(GDBSUPPORT) + $(GDBSUPPORT) $(SILENCE) rm -f gdbreplay$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ $(CXXFLAGS) \ diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index ee70911..b28e57e 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -291,7 +291,6 @@ LARGEFILE_CPPFLAGS = @LARGEFILE_CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBIPT = @LIBIPT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/gdbsupport/configure b/gdbsupport/configure index 19b19c4..56f182e 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -650,7 +650,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -10358,7 +10357,6 @@ 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 diff --git a/gold/Makefile.am b/gold/Makefile.am index ddd6a00..ef307ad 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -185,7 +185,7 @@ libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES) libgold_a_LIBADD = $(LIBOBJS) sources_var = main.cc -deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP) +deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \ $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) ldflags_var = $(GOLD_LDFLAGS) @@ -198,13 +198,12 @@ ld_new_LDFLAGS = $(ldflags_var) EXTRA_ld_new_SOURCES = $(TARGETSOURCES) incremental_dump_SOURCES = incremental-dump.cc -incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \ - $(LIBINTL_DEP) +incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \ $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) dwp_SOURCES = dwp.cc -dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP) +dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \ $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) dwp_LDFLAGS = $(GOLD_LDFLAGS) diff --git a/gold/Makefile.in b/gold/Makefile.in index 1e6b9c7..996f5e0 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -569,7 +569,6 @@ LDFLAGS = @LDFLAGS@ LFS_CFLAGS = @LFS_CFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ @@ -827,7 +826,7 @@ ALL_TARGETOBJS = \ libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES) libgold_a_LIBADD = $(LIBOBJS) sources_var = main.cc -deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP) +deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \ $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) @@ -838,14 +837,12 @@ ld_new_LDADD = $(ldadd_var) ld_new_LDFLAGS = $(ldflags_var) EXTRA_ld_new_SOURCES = $(TARGETSOURCES) incremental_dump_SOURCES = incremental-dump.cc -incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \ - $(LIBINTL_DEP) - +incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \ $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) dwp_SOURCES = dwp.cc -dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP) +dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \ $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) diff --git a/gold/configure b/gold/configure index a2674d6..66007ef 100755 --- a/gold/configure +++ b/gold/configure @@ -698,7 +698,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -8773,7 +8772,6 @@ 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 diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 2f1348f..2fb2a53 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -118,7 +118,7 @@ check_LIBRARIES = libgoldtest.a libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc DEPENDENCIES = \ - libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP) + libgoldtest.a ../libgold.a ../../libiberty/libiberty.a # The unittests themselves if NATIVE_OR_CROSS_LINKER diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 9cf21df..1c7a455 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -2671,7 +2671,6 @@ LDFLAGS = @LDFLAGS@ LFS_CFLAGS = @LFS_CFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ @@ -2904,7 +2903,7 @@ TESTS = $(check_SCRIPTS) $(check_PROGRAMS) check_LIBRARIES = libgoldtest.a libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc DEPENDENCIES = \ - libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP) + libgoldtest.a ../libgold.a ../../libiberty/libiberty.a @NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_SOURCES = object_unittest.cc @NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_LDFLAGS = $(THREADFLAGS) diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 0b2b599..02c2236 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -45,7 +45,7 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ search_list.c symtab.c sym_ids.c utils.c \ i386.c alpha.c vax.c sparc.c mips.c aarch64.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c -gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP) +gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL) noinst_HEADERS = \ diff --git a/gprof/Makefile.in b/gprof/Makefile.in index a739823..65b89c8 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -352,7 +352,6 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -468,7 +467,7 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ i386.c alpha.c vax.c sparc.c mips.c aarch64.c gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c -gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP) +gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL) noinst_HEADERS = \ basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \ diff --git a/gprof/configure b/gprof/configure index 64f14fa..297958d 100755 --- a/gprof/configure +++ b/gprof/configure @@ -649,7 +649,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -10653,7 +10652,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10656 "configure" +#line 10655 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10759,7 +10758,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10762 "configure" +#line 10761 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13311,7 +13310,6 @@ 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 diff --git a/ld/Makefile.am b/ld/Makefile.am index 6a9833e..d760f13 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -658,7 +658,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c plugin.c \ ldbuildid.c ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \ - $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) + $(BFDLIB) $(LIBCTF) $(LIBIBERTY) ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \ $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) diff --git a/ld/Makefile.in b/ld/Makefile.in index 8639e78..e5495a0 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -425,7 +425,6 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1036,7 +1035,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai ldbuildid.c ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \ - $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) + $(BFDLIB) $(LIBCTF) $(LIBIBERTY) ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \ $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) diff --git a/ld/configure b/ld/configure index 4e8de84..e98874f 100755 --- a/ld/configure +++ b/ld/configure @@ -667,7 +667,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11683,7 +11682,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11686 "configure" +#line 11685 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11789,7 +11788,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11792 "configure" +#line 11791 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18100,7 +18099,6 @@ 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 diff --git a/libctf/Makefile.in b/libctf/Makefile.in index 54f5daa..d0644fc 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -470,7 +470,6 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/libctf/configure b/libctf/configure index 7466d56..027ba03 100755 --- a/libctf/configure +++ b/libctf/configure @@ -684,7 +684,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -7402,7 +7401,6 @@ 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 @@ -13596,7 +13594,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13599 "configure" +#line 13597 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13702,7 +13700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13705 "configure" +#line 13703 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 57aaed2..a9dc6b4 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -324,7 +324,6 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/opcodes/configure b/opcodes/configure index 050fd5f..d8ca042 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -656,7 +656,6 @@ INSTOBJEXT DATADIRNAME CATALOGS INCINTL -LIBINTL_DEP POSUB LTLIBINTL LIBINTL @@ -11090,7 +11089,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11093 "configure" +#line 11092 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11196,7 +11195,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11199 "configure" +#line 11198 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13646,7 +13645,6 @@ 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 @@ -14346,8 +14344,6 @@ else BUILD_LIBS=-liberty BUILD_LIB_DEPS= fi -BUILD_LIBS="$BUILD_LIBS $LIBINTL" -BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 4d918e3..09e2f04 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -160,8 +160,6 @@ else BUILD_LIBS=-liberty BUILD_LIB_DEPS= fi -BUILD_LIBS="$BUILD_LIBS $LIBINTL" -BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" AC_SUBST(BUILD_LIBS) AC_SUBST(BUILD_LIB_DEPS) -- cgit v1.1