aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/Makefile.am6
-rw-r--r--bfd/Makefile.in6
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/doc/Makefile.am2
-rw-r--r--gas/doc/Makefile.in1
6 files changed, 14 insertions, 11 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 064d5ae..d189f2d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2014-07-04 Alan Modra <amodra@gmail.com>
+ * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove configure.in.
+ * Makefile.in: Regenerate.
+
+2014-07-04 Alan Modra <amodra@gmail.com>
+
* version.m4: New file.
* configure.in: Include version.m4.
(AC_INIT): Update.
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 72ee0bf..3c59c87 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -732,11 +732,9 @@ OPTIONAL_BACKENDS_CFILES = \
sco5-core.c \
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
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 807cc98..215dea0 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1036,11 +1036,9 @@ 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
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c9adf37..7c045d4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
2014-07-04 Alan Modra <amodra@gmail.com>
+ * doc/Makefile.am (CONFIG_STATUS_DEPENDENCIES): Delete.
+ * doc/Makefile.in: Regenerate.
+
+2014-07-04 Alan Modra <amodra@gmail.com>
+
* configure.in: Include bfd/version.m4.
(AC_INIT, AM_INIT_AUTOMAKE): Use modern form.
(BFD_VERSION): Delete.
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 10f2e68..c2ddc02 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -112,8 +112,6 @@ MAINTAINERCLEANFILES = asconfig.texi
BASEDIR = $(srcdir)/../..
BFDDIR = $(BASEDIR)/bfd
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
-
# Maintenance
# We need it for the taz target in ../../Makefile.in.
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index a67a558..3ced97c 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -347,7 +347,6 @@ noinst_TEXINFOS = internals.texi
MAINTAINERCLEANFILES = asconfig.texi as.info
BASEDIR = $(srcdir)/../..
BFDDIR = $(BASEDIR)/bfd
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
# Automake 1.9 will only build info files in the objdir if they are
# mentioned in DISTCLEANFILES. It doesn't have to be unconditional,