This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: [patch] automake 1.8 support for gas
On Mon, 22 Dec 2003, Daniel Jacobowitz wrote:
> I can't approve it but it looks OK to me. Shouldn't you add 1.8 to
> gas/Makefile.am:AUTOMAKE_OPTIONS also?
It wouldn't hurt, but there's no need to. The requirement in the
subdirectory will trigger anyway and the top level doesn't really need 1.8
at the moment.
> Meanwhile, do you have any idea about the next of many automake
> problems I've noticed: the rule which makes Makefile dependent on
> bfd/configure.in (for the version number) now supresses rebuilding of
> the Makefile. This is a documented change in autoconf 1.7/1.8. I
> don't see any way to add a dependency to a default rule without
> replacing it entirely.
Well, the following patch works for me. :-)
2003-12-22 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.
This time automake 1.8 is required at the top level of gas as well
(although CONFIG_STATUS_DEPENDENCIES is documented to have been present
earlier, but it was undocumented).
OK to apply?
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
binutils-2.14.90-20031222-gas-makefile-dep.patch
diff -up --recursive --new-file binutils-2.14.90-20031222.macro/gas/Makefile.am binutils-2.14.90-20031222/gas/Makefile.am
--- binutils-2.14.90-20031222.macro/gas/Makefile.am 2003-12-03 04:25:28.000000000 +0000
+++ binutils-2.14.90-20031222/gas/Makefile.am 2003-12-22 21:16:32.000000000 +0000
@@ -3,7 +3,7 @@
## Work around apparent automake bug.
INTLLIBS = @INTLLIBS@
-AUTOMAKE_OPTIONS = cygnus dejagnu
+AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
SUBDIRS = doc po
@@ -794,7 +794,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 -up --recursive --new-file binutils-2.14.90-20031222.macro/gas/doc/Makefile.am binutils-2.14.90-20031222/gas/doc/Makefile.am
--- binutils-2.14.90-20031222.macro/gas/doc/Makefile.am 2003-11-13 04:25:22.000000000 +0000
+++ binutils-2.14.90-20031222/gas/doc/Makefile.am 2003-12-22 21:45:15.000000000 +0000
@@ -78,6 +78,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.