summaryrefslogtreecommitdiff
path: root/gprof
diff options
context:
space:
mode:
Diffstat (limited to 'gprof')
-rw-r--r--gprof/ChangeLog8
-rw-r--r--gprof/Makefile.am5
-rw-r--r--gprof/Makefile.in17
-rw-r--r--gprof/gprof.texi14
4 files changed, 33 insertions, 11 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 3fe1350c13..23c73edb59 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-22 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile.am (TEXI2POD): Include $(AM_MAKEINFOFLAGS).
+ (AM_MAKEINFOFLAGS, TEXI2DVI): Define with -I ../bfd/doc.
+ * Makefile.in: Regenerate.
+ * gprof.texi: Include bfdver.texi. Report both VERSION_PACKAGE
+ and VERSION.
+
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (REPORT_BUGS_TO): Removed.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 3a3fb43eba..e439b1cc29 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -56,7 +56,7 @@ po/POTFILES.in: @MAINT@ Makefile
MANCONF = -Dman
-TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
@@ -64,6 +64,9 @@ info_TEXINFOS = gprof.texi
gprof_TEXINFOS = config.texi
man_MANS = gprof.1
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
+
config.texi:
echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 8ed62190aa..f0b08f597f 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -95,11 +95,6 @@ PDFS = gprof.pdf
PSS = gprof.ps
HTMLS = gprof.html
TEXINFOS = gprof.texi
-TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \
- echo $(top_srcdir)/../texinfo/util/texi2dvi; \
- else \
- echo texi2dvi; \
- fi`
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
@@ -258,11 +253,13 @@ BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
POTFILES = $(sources) $(noinst_HEADERS)
MANCONF = -Dman
-TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
info_TEXINFOS = gprof.texi
gprof_TEXINFOS = config.texi
man_MANS = gprof.1
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
MAINTAINERCLEANFILES = gprof.info
@@ -282,15 +279,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
- cd $(srcdir) && $(AUTOMAKE) --cygnus \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --cygnus Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/gprof/gprof.texi b/gprof/gprof.texi
index beeddb6611..064c460c1b 100644
--- a/gprof/gprof.texi
+++ b/gprof/gprof.texi
@@ -5,6 +5,10 @@
@settitle GNU gprof
@setchapternewpage odd
+@c man begin INCLUDE
+@include bfdver.texi
+@c man end
+
@ifinfo
@c This is a dir.info fragment to support semi-automated addition of
@c manuals to an info tree. zoo@cygnus.com is developing this facility.
@@ -45,6 +49,10 @@ notice identical to this one except for the removal of this paragraph
@titlepage
@title GNU gprof
@subtitle The @sc{gnu} Profiler
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
+@subtitle Version @value{VERSION}
@author Jay Fenlason and Richard Stallman
@page
@@ -76,6 +84,12 @@ can use it to determine which parts of a program are taking most of the
execution time. We assume that you know how to write, compile, and
execute programs. @sc{gnu} @code{gprof} was written by Jay Fenlason.
+This manual is for @code{gprof}
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
+
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
section entitled ``GNU Free Documentation License''.