diff options
| -rw-r--r-- | gas/ChangeLog | 12 | ||||
| -rw-r--r-- | gas/Makefile.am | 4 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 7aea5c2..93c0a34 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 84b5dda..0a88de0 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 a9977f3..7f0f805 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. |