* 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 7aea5c22d81a56c3f144b43eb0c11820340521ad..93c0a34d82481768c4ac74432fed438579797940 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+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.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 84b5dda1b1674c7a29192d781a3b73809bd3bd83..0a88de05adb6fcb6f5bd05007720e22eadc40f65 100644 (file)
--- 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 a9977f3170273c51f3278862760407597799d4d9..7f0f805fbc58722afa857bdb3d72554755ee8d08 100644 (file)
--- 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.