diff options
| author | dim <dim@FreeBSD.org> | 2010-11-01 19:35:33 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-01 19:35:33 +0000 |
| commit | 3f5c947f4453c6016a2a6a9636367ee3f48fc6fc (patch) | |
| tree | 461aafc934d462eb9b9221308f8e25238c0ada62 /contrib/binutils/gas/doc/Makefile.am | |
| parent | e6be3e7867eb43d220575baee2ce5662fb03e46c (diff) | |
| parent | d0f678fa0ff3f08a4eca29daf4d1ac39797b6326 (diff) | |
| download | FreeBSD-src-3f5c947f4453c6016a2a6a9636367ee3f48fc6fc.zip FreeBSD-src-3f5c947f4453c6016a2a6a9636367ee3f48fc6fc.tar.gz | |
Merge ^/vendor/binutils/dist@214571 into contrib/binutils, which brings
us up to version 2.17.50.20070703, at the last GPLv2 commit.
Amongst others, this added upstream support for some FreeBSD-specific
things that we previously had to manually hack in, such as the OSABI
label support, and so on.
There are also quite a number of new files, some for cpu's (e.g. SPU)
that we may or may not be interested in, but those can be cleaned up
later on, if needed.
Diffstat (limited to 'contrib/binutils/gas/doc/Makefile.am')
| -rw-r--r-- | contrib/binutils/gas/doc/Makefile.am | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/contrib/binutils/gas/doc/Makefile.am b/contrib/binutils/gas/doc/Makefile.am index d48a9cc..4f6ff92 100644 --- a/contrib/binutils/gas/doc/Makefile.am +++ b/contrib/binutils/gas/doc/Makefile.am @@ -16,9 +16,12 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 info_TEXINFOS = as.texinfo +as_TEXINFOS = asconfig.texi $(CPU_DOCS) -AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" -TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ + -I ../../bfd/doc asconfig.texi: $(CONFIG).texi rm -f asconfig.texi @@ -29,7 +32,9 @@ CPU_DOCS = \ c-alpha.texi \ c-arc.texi \ c-arm.texi \ + c-avr.texi \ c-bfin.texi \ + c-cr16.texi \ c-d10v.texi \ c-cris.texi \ c-h8300.texi \ @@ -61,13 +66,6 @@ CPU_DOCS = \ c-z80.texi \ c-z8k.texi -gasver.texi: $(srcdir)/../../bfd/configure - rm -f $@ - eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ - echo "@set VERSION $$VERSION" > $@ - -$(srcdir)/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 @@ -97,7 +95,7 @@ install-html-am: $(HTMLS) noinst_TEXINFOS = internals.texi -MAINTAINERCLEANFILES = asconfig.texi gasver.texi +MAINTAINERCLEANFILES = asconfig.texi BASEDIR = $(srcdir)/../.. BFDDIR = $(BASEDIR)/bfd @@ -112,7 +110,7 @@ info-local: $(MANS) # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. -as.1: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) +as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS) touch $@ -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod -($(POD2MAN) as.pod | \ @@ -120,3 +118,12 @@ as.1: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) mv -f $@.T$$$$ $@) || \ (rm -f $@.T$$$$ && exit 1) rm -f as.pod + +MAINTAINERCLEANFILES += as.info + +# Automake 1.9 will only build info files in the objdir if they are +# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, +# though, so we use a bogus condition. +if GENINSRC_NEVER +DISTCLEANFILES = as.info +endif |
