From: macro <macro>
Date: Mon, 5 Jan 2004 22:16:05 +0000 (+0000)
Subject: * Makefile.am (Makefile): Move the dependency on
X-Git-Tag: reparent-point~4703
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fc6190f6b16296c7ee67b9f4d10708f638c790c0;p=pf3gnuchains%2Fpf3gnuchains4x.git

* Makefile.am (Makefile): Move the dependency on
$(BFDDIR)/configure.in to...
(CONFIG_STATUS_DEPENDENCIES): ... here.
(AUTOMAKE_OPTIONS): Require automake 1.8.
* Makefile.in: Regenerate.
* doc/Makefile.am (BASEDIR, BFDDIR): Define.
(CONFIG_STATUS_DEPENDENCIES): Add a dependency on
$(BFDDIR)/configure.in here as well.
* doc/Makefile.in: Regenerate.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7aea5c22d8..93c0a34d82 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,17 @@
 2004-01-05  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
+	* Makefile.am (Makefile): Move the dependency on
+	$(BFDDIR)/configure.in to...
+	(CONFIG_STATUS_DEPENDENCIES): ... here.
+	(AUTOMAKE_OPTIONS): Require automake 1.8.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.am (BASEDIR, BFDDIR): Define.
+	(CONFIG_STATUS_DEPENDENCIES): Add a dependency on
+	$(BFDDIR)/configure.in here as well.
+	* doc/Makefile.in: Regenerate.
+
+2004-01-05  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
 	* Makefile.am (install, install-info, RECURSIVE_TARGETS): Remove.
 	* Makefile.in: Regenerate.
 	* aclocal.m4: Regenerate.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 84b5dda1b1..0a88de05ad 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -3,7 +3,7 @@
 ## Work around apparent automake bug.
 INTLLIBS = @INTLLIBS@
 
-AUTOMAKE_OPTIONS = cygnus dejagnu
+AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
 
 SUBDIRS = doc po
 
@@ -788,7 +788,7 @@ de-stage3:
 DEP_FILE_DEPS =  $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
 	$(TARGET_CPU_HFILES) $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES)
 
-Makefile: $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
 
 # Automatic dependency computation.  This is a real pain, because the
 # dependencies change based on target_cpu_type and obj_format.
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index a9977f3170..7f0f805fbc 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -77,6 +77,11 @@ DISTCLEANFILES = asconfig.texi
 
 MAINTAINERCLEANFILES = gasver.texi
 
+BASEDIR = $(srcdir)/../..
+BFDDIR = $(BASEDIR)/bfd
+
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.