Remove section VMA adjustment when computing the address of the line to show.

[deliverable/binutils-gdb.git] / binutils / Makefile.am

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 837f861330e9d4c431617aaaa41ab2071b5ddcb7..ebe32f460f1a3aa14c114e837c29e65fec459cd1 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -52,8 +52,28 @@ DLLWRAP_PROG=dllwrap
 
 SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) 
 
-man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \
-       addr2line.1 nlmconv.1 $(DEMANGLER_NAME).1
+MANCONF  = -Dman
+
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+
+POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
+
+# List of man pages generated from binutils.texi
+man_MANS = \
+       addr2line.1 \
+       ar.1 \
+       dlltool.1 \
+       nlmconv.1 \
+       nm.1 \
+       objcopy.1 \
+       objdump.1 \
+       ranlib.1 \
+       readelf.1 \
+       size.1 \
+       strings.1 \
+       strip.1 \
+       windres.1 \
+       $(DEMANGLER_NAME).1
 
 PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@
 
@@ -161,7 +181,7 @@ objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
 
 strings_SOURCES = strings.c $(BULIBS)
 
-readelf_SOURCES = readelf.c version.c
+readelf_SOURCES = readelf.c version.c unwind-ia64.c
 readelf_LDADD   = $(INTLLIBS) $(LIBIBERTY)
 
 strip_new_SOURCES = objcopy.c is-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
@@ -171,6 +191,9 @@ nm_new_SOURCES = nm.c $(BULIBS)
 objdump_SOURCES = objdump.c prdbg.c $(DEBUG_SRCS) $(BULIBS)
 objdump_LDADD = $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS)
 
+objdump.o:objdump.c
+       $(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+
 underscore.c: stamp-under ; @true
 
 stamp-under: Makefile
@@ -287,8 +310,13 @@ DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
        rm -f DEP1
        $(MAKE) MKDEP="$(MKDEP)" DEP1
-       sed -f dep.sed < DEP1 > $@
-       echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@
+       sed -f dep.sed < DEP1 > DEPA
+       echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
+       if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+         echo 'make DEP failed!'; exit 1; \
+       else \
+         mv -f DEPA $@; \
+       fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
        echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
@@ -331,6 +359,105 @@ binutils.dvi: $(srcdir)/binutils.texi config.texi
 
 binutils.info: $(srcdir)/binutils.texi config.texi
 
+# Man page generation from texinfo
+$(srcdir)/addr2line.1: $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Daddr2line < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/ar.1:        $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dar < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/dlltool.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/nlmconv.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/nm.1:        $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dnm < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/objcopy.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/objdump.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dobjdump < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/ranlib.1:    $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dranlib < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/readelf.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dreadelf < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/size.1:      $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dsize < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/strings.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dstrings < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/strip.1:     $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dstrip < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/windres.1:   $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dwindres < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
+$(srcdir)/cxxfilt.man: $(srcdir)/binutils.texi
+       touch $@
+       -$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $@.pod
+       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
+       rm -f $@.pod
+
 MAINTAINERCLEANFILES = config.texi
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
@@ -342,7 +469,7 @@ MOSTLYCLEANFILES = sysinfo $(DEMANGLER_NAME).1 binutils.log binutils.sum \
 mostlyclean-local:
        -rm -rf tmpdir
 
-CLEANFILES = dep.sed DEP DEP1 DEP2
+CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 
 .PHONY: install-exec-local
 
@@ -443,8 +570,8 @@ srconv.o: srconv.c bucomm.h config.h $(INCDIR)/bin-bugs.h \
 stabs.o: stabs.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/libiberty.h $(INCDIR)/demangle.h debug.h \
-  budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def
+  budbg.h $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
 strings.o: strings.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/libiberty.h
@@ -484,7 +611,9 @@ readelf.o: readelf.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/arc.h \
   $(INCDIR)/elf/fr30.h $(INCDIR)/elf/mcore.h $(INCDIR)/elf/i960.h \
   $(INCDIR)/elf/pj.h $(INCDIR)/elf/avr.h $(INCDIR)/elf/ia64.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  $(INCDIR)/elf/cris.h $(INCDIR)/elf/i860.h $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/s390.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/fopen-same.h unwind-ia64.h
 resres.o: resres.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/libiberty.h windres.h winduni.h