This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Update autoconf in binutils and ld directories and import ylwrap


On Wed, May 18, 2005 at 01:19:32AM +1200, John Marshall wrote:
> Daniel Jacobowitz wrote:
> >I don't need any approval for this patch, but I would definitely 
> >appreciate proofreading before I check it in.  I have left out the 
> >(huge) changes to generated files.
> >
> >Comments?
> 
> The changes to the config.texi and ldver.texi rules in 
> binutils/doc/Makefile.am and ld/Makefile.am introduce the use of $< in 
> explicit rules.  This is not portable make usage; e.g., POSIX only 
> defines $< in inference rules (what GNU Make calls suffix rules) or the 
> .DEFAULT rule.  The last time I pointed something similar out :-), Ben 
> Elliston confirmed that binutils was not requiring GNU Make [1], and I 
> assume, based on binutils/NEWS, that this is still the case.
> 
> If so, it's easily fixed.

I'm presuming you have some non-GNU make handy to test with.  Could you
try the attached?  Part of this will be necessary for 2.16.1.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>

	* doc/Makefile.am (config.texi): Don't use $<.
	* doc/Makefile.in: Regenerated.

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.am (ldver.texi): Don't use $<.
	* Makefile.in: Regenerated.

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>

	* doc/Makefile.am (gasver.texi): Don't use $<.
	* doc/Makefile.in: Regenerated.

Index: binutils/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- binutils/doc/Makefile.am	15 May 2005 18:19:38 -0000	1.8
+++ binutils/doc/Makefile.am	17 May 2005 13:34:58 -0000
@@ -36,7 +36,8 @@ binutils_TEXI = $(srcdir)/binutils.texi
 
 config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	rm -f config.texi
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
 
 # Man page generation from texinfo
Index: binutils/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.in,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.in
--- binutils/doc/Makefile.in	15 May 2005 18:19:38 -0000	1.20
+++ binutils/doc/Makefile.in	17 May 2005 13:34:58 -0000
@@ -567,7 +567,8 @@ uninstall-man: uninstall-man1
 
 config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	rm -f config.texi
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
 
 # Man page generation from texinfo
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile.am
--- ld/Makefile.am	15 May 2005 18:19:44 -0000	1.174
+++ ld/Makefile.am	17 May 2005 13:34:59 -0000
@@ -1635,7 +1635,8 @@ configdoc.texi:	${DOCVER}-doc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
Index: ld/Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile.in
--- ld/Makefile.in	15 May 2005 18:19:44 -0000	1.188
+++ ld/Makefile.in	17 May 2005 13:35:00 -0000
@@ -2428,7 +2428,8 @@ configdoc.texi:	${DOCVER}-doc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile.am
--- gas/doc/Makefile.am	2 May 2005 22:00:41 -0000	1.32
+++ gas/doc/Makefile.am	17 May 2005 13:35:02 -0000
@@ -60,7 +60,8 @@ CPU_DOCS = \
 
 gasver.texi: $(srcdir)/../../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile.in
--- gas/doc/Makefile.in	2 May 2005 22:00:41 -0000	1.65
+++ gas/doc/Makefile.in	17 May 2005 13:35:03 -0000
@@ -582,7 +582,8 @@ asconfig.texi: $(CONFIG).texi
 
 gasver.texi: $(srcdir)/../../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]