From 37d037c12dfbea00a85ee927fc6d9904dbeaf1bb Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 12 Dec 2006 14:31:48 +0000 Subject: [PATCH] bfd/ * doc/Makefile.am (bfd_TEXINFOS): Set. (bfd.info bfd.dvi bfd.html): Delete rule. * doc/Makefile.in: Regenerated. gas/ * doc/Makefile.am (as_TEXINFOS): Set. (as.info as.dvi as.html): Delete rule. * doc/Makefile.in: Regenerated. gprof/ * Makefile.am (gprof_TEXINFOS): Set. (gprof.info gprof.dvi gprof.html): Delete rule. * Makefile.in: Regenerated. ld/ * Makefile.am (ld_TEXINFOS): Set. (ld.info ld.dvi ld.html): Delete rule. * Makefile.in: Regenerated. --- bfd/ChangeLog | 6 ++++++ bfd/doc/Makefile.am | 3 +-- bfd/doc/Makefile.in | 14 +++++++------- gas/ChangeLog | 6 ++++++ gas/doc/Makefile.am | 3 +-- gas/doc/Makefile.in | 14 +++++++------- gprof/ChangeLog | 6 ++++++ gprof/Makefile.am | 3 +-- gprof/Makefile.in | 29 +++++++++++++++++++++++------ ld/ChangeLog | 6 ++++++ ld/Makefile.am | 3 +-- ld/Makefile.in | 14 +++++++------- 12 files changed, 72 insertions(+), 35 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6ffc552..8964070 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2006-12-12 Daniel Jacobowitz + + * doc/Makefile.am (bfd_TEXINFOS): Set. + (bfd.info bfd.dvi bfd.html): Delete rule. + * doc/Makefile.in: Regenerated. + 2006-12-11 Daniel Jacobowitz * configure.in: Define GENINSRC_NEVER. diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index 1ba74b7..242e4ec 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -51,6 +51,7 @@ SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \ TEXIDIR = $(srcdir)/../../texinfo/fsf info_TEXINFOS = bfd.texinfo +bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi MKDOC = chew$(EXEEXT_FOR_BUILD) @@ -68,8 +69,6 @@ chew.o: chew.c protos: libbfd.h libcoff.h bfd.h -bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo - # We can't replace these rules with an implicit rule, because # makes without VPATH support couldn't find the .h files in `..'. diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 9d07b69..3aee8ae 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -42,7 +42,8 @@ target_triplet = @target@ # though, so we use a bogus condition. @GENINSRC_NEVER_TRUE@am__append_1 = bfd.info subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(bfd_TEXINFOS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/acx.m4 \ @@ -269,6 +270,7 @@ SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \ TEXIDIR = $(srcdir)/../../texinfo/fsf info_TEXINFOS = bfd.texinfo +bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi MKDOC = chew$(EXEEXT_FOR_BUILD) INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ -I$(srcdir)/../../intl -I../../intl @@ -367,7 +369,7 @@ clean-libtool: distclean-libtool: -rm -f libtool -bfd.info: bfd.texinfo +bfd.info: bfd.texinfo $(bfd_TEXINFOS) restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -385,17 +387,17 @@ bfd.info: bfd.texinfo fi; \ rm -rf $$backupdir; exit $$rc -bfd.dvi: bfd.texinfo +bfd.dvi: bfd.texinfo $(bfd_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) -o $@ `test -f 'bfd.texinfo' || echo '$(srcdir)/'`bfd.texinfo -bfd.pdf: bfd.texinfo +bfd.pdf: bfd.texinfo $(bfd_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) -o $@ `test -f 'bfd.texinfo' || echo '$(srcdir)/'`bfd.texinfo -bfd.html: bfd.texinfo +bfd.html: bfd.texinfo $(bfd_TEXINFOS) rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) `test -f 'bfd.texinfo' || echo '$(srcdir)/'`bfd.texinfo; \ @@ -602,8 +604,6 @@ chew.o: chew.c protos: libbfd.h libcoff.h bfd.h -bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo - # We can't replace these rules with an implicit rule, because # makes without VPATH support couldn't find the .h files in `..'. diff --git a/gas/ChangeLog b/gas/ChangeLog index 6bf4e8f..27a8df0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2006-12-12 Daniel Jacobowitz + + * doc/Makefile.am (as_TEXINFOS): Set. + (as.info as.dvi as.html): Delete rule. + * doc/Makefile.in: Regenerated. + 2006-12-11 Daniel Jacobowitz * configure.in: Define GENINSRC_NEVER. diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index bfe4196..7590291 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -16,6 +16,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo +as_TEXINFOS = asconfig.texi gasver.texi $(CPU_DOCS) AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" @@ -67,8 +68,6 @@ gasver.texi: $(srcdir)/../../bfd/configure eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ -as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index e70a955..27f79c8 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -37,7 +37,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(as_TEXINFOS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../bfd/warning.m4 \ @@ -213,6 +214,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo +as_TEXINFOS = asconfig.texi gasver.texi $(CPU_DOCS) AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" CPU_DOCS = \ @@ -308,7 +310,7 @@ clean-libtool: distclean-libtool: -rm -f libtool -as.info: as.texinfo +as.info: as.texinfo $(as_TEXINFOS) restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -326,17 +328,17 @@ as.info: as.texinfo fi; \ rm -rf $$backupdir; exit $$rc -as.dvi: as.texinfo +as.dvi: as.texinfo $(as_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) -o $@ `test -f 'as.texinfo' || echo '$(srcdir)/'`as.texinfo -as.pdf: as.texinfo +as.pdf: as.texinfo $(as_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) -o $@ `test -f 'as.texinfo' || echo '$(srcdir)/'`as.texinfo -as.html: as.texinfo +as.html: as.texinfo $(as_TEXINFOS) rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) `test -f 'as.texinfo' || echo '$(srcdir)/'`as.texinfo; \ @@ -591,8 +593,6 @@ gasver.texi: $(srcdir)/../../bfd/configure eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ -as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info diff --git a/gprof/ChangeLog b/gprof/ChangeLog index cc2c54a..a3ac41f 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,9 @@ +2006-12-12 Daniel Jacobowitz + + * Makefile.am (gprof_TEXINFOS): Set. + (gprof.info gprof.dvi gprof.html): Delete rule. + * Makefile.in: Regenerated. + 2006-12-11 Daniel Jacobowitz * configure.in: Define GENINSRC_NEVER. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index ea3fa4a..ba93be1 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -59,10 +59,9 @@ TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1 info_TEXINFOS = gprof.texi +gprof_TEXINFOS = config.texi man_MANS = gprof.1 -gprof.info: gprof.texi config.texi - config.texi: echo "@set top_srcdir $(top_srcdir)" >> ./config.texi diff --git a/gprof/Makefile.in b/gprof/Makefile.in index d2d7971..cf50599 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -45,7 +45,7 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub README \ $(srcdir)/gconfig.in $(srcdir)/../mkinstalldirs \ $(top_srcdir)/po/Make-in $(srcdir)/../ltmain.sh \ $(srcdir)/../config.guess $(srcdir)/../config.sub \ - $(noinst_HEADERS) + $(gprof_TEXINFOS) $(noinst_HEADERS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -261,6 +261,7 @@ MANCONF = -Dman TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1 info_TEXINFOS = gprof.texi +gprof_TEXINFOS = config.texi man_MANS = gprof.1 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 @@ -383,17 +384,35 @@ clean-libtool: distclean-libtool: -rm -f libtool -gprof.dvi: gprof.texi +gprof.info: gprof.texi $(gprof_TEXINFOS) + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $@ `test -f 'gprof.texi' || echo '$(srcdir)/'`gprof.texi; \ + then \ + rc=0; \ + else \ + rc=$$?; \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + rm -rf $$backupdir; exit $$rc + +gprof.dvi: gprof.texi $(gprof_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) -o $@ `test -f 'gprof.texi' || echo '$(srcdir)/'`gprof.texi -gprof.pdf: gprof.texi +gprof.pdf: gprof.texi $(gprof_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) -o $@ `test -f 'gprof.texi' || echo '$(srcdir)/'`gprof.texi -gprof.html: gprof.texi +gprof.html: gprof.texi $(gprof_TEXINFOS) rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) `test -f 'gprof.texi' || echo '$(srcdir)/'`gprof.texi; \ @@ -796,8 +815,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -gprof.info: gprof.texi config.texi - config.texi: echo "@set top_srcdir $(top_srcdir)" >> ./config.texi diff --git a/ld/ChangeLog b/ld/ChangeLog index a3a60d5..43f9ec8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2006-12-12 Daniel Jacobowitz + + * Makefile.am (ld_TEXINFOS): Set. + (ld.info ld.dvi ld.html): Delete rule. + * Makefile.in: Regenerated. + 2006-12-12 Ina Pandit * ldlang.c (print_output_section_statement): Print load address diff --git a/ld/Makefile.am b/ld/Makefile.am index 9b8d198..5cf46ba 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -91,6 +91,7 @@ CXX_FOR_TARGET = ` \ noinst_PROGRAMS = ld-new info_TEXINFOS = ld.texinfo +ld_TEXINFOS = configdoc.texi ldver.texi noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 @@ -1760,8 +1761,6 @@ ldver.texi: $(srcdir)/../bfd/configure eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ -ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi - # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. diff --git a/ld/Makefile.in b/ld/Makefile.in index 5d9659a..7c802b4 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -49,7 +49,8 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub NEWS \ $(srcdir)/config.in $(srcdir)/../mkinstalldirs \ $(top_srcdir)/po/Make-in ldgram.h ldgram.c ldlex.c deffilep.h \ deffilep.c $(srcdir)/../ylwrap $(srcdir)/../ltmain.sh \ - $(srcdir)/../config.guess $(srcdir)/../config.sub + $(srcdir)/../config.guess $(srcdir)/../config.sub \ + $(ld_TEXINFOS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -329,6 +330,7 @@ CXX_FOR_TARGET = ` \ fi` info_TEXINFOS = ld.texinfo +ld_TEXINFOS = configdoc.texi ldver.texi noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty @@ -813,7 +815,7 @@ clean-libtool: distclean-libtool: -rm -f libtool -ld.info: ld.texinfo +ld.info: ld.texinfo $(ld_TEXINFOS) restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -831,17 +833,17 @@ ld.info: ld.texinfo fi; \ rm -rf $$backupdir; exit $$rc -ld.dvi: ld.texinfo +ld.dvi: ld.texinfo $(ld_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) -o $@ `test -f 'ld.texinfo' || echo '$(srcdir)/'`ld.texinfo -ld.pdf: ld.texinfo +ld.pdf: ld.texinfo $(ld_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) -o $@ `test -f 'ld.texinfo' || echo '$(srcdir)/'`ld.texinfo -ld.html: ld.texinfo +ld.html: ld.texinfo $(ld_TEXINFOS) rm -rf $(@:.html=.htp) if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) `test -f 'ld.texinfo' || echo '$(srcdir)/'`ld.texinfo; \ @@ -2562,8 +2564,6 @@ ldver.texi: $(srcdir)/../bfd/configure eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ -ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi - # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. -- 2.7.4