aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
Diffstat (limited to 'gold')
-rw-r--r--gold/Makefile.am7
-rw-r--r--gold/Makefile.in9
-rwxr-xr-xgold/configure2
-rw-r--r--gold/testsuite/Makefile.am2
-rw-r--r--gold/testsuite/Makefile.in3
5 files changed, 8 insertions, 15 deletions
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)