use alternatives for gold

[platform/upstream/binutils.git] / bfd / Makefile.in

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 2ea8516..2c385d5 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -80,7 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
        $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -337,9 +337,6 @@ top_srcdir = @top_srcdir@
 wordsize = @wordsize@
 AUTOMAKE_OPTIONS = 1.11 no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
-
-# Uncomment the following line when doing a release.
-# RELEASE=y
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 SUBDIRS = doc po
@@ -1039,17 +1036,15 @@ OPTIONAL_BACKENDS_CFILES = \
        trad-core.c
 
 
-# We want to rerun configure if configure.in, config.bfd or
-# configure.host change. configure.in is needed since the version
-# number in Makefile comes from configure.in.
+# Reconfigure if config.bfd or configure.host changes.
+# development.sh is used to determine -Werror default.
 CONFIG_STATUS_DEPENDENCIES = \
-       $(srcdir)/configure.in \
        $(srcdir)/config.bfd \
        $(srcdir)/configure.host \
        $(srcdir)/development.sh
 
 
-# These are defined by configure.in:
+# These are defined by configure:
 WORDSIZE = @wordsize@
 ALL_BACKENDS = @all_backends@
 BFD_BACKENDS = @bfd_backends@
@@ -2087,14 +2082,15 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
        $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
        touch stmp-lcoff-h
 
-bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
+bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
        @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
-       if test "x$(RELEASE)" = x ; then \
+       . $(srcdir)/development.sh ;\
+       if test "$$development" = true ; then \
          bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\