diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 3 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 14 |
3 files changed, 14 insertions, 9 deletions
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 <dan@codesourcery.com> + + * doc/Makefile.am (as_TEXINFOS): Set. + (as.info as.dvi as.html): Delete rule. + * doc/Makefile.in: Regenerated. + 2006-12-11 Daniel Jacobowitz <dan@codesourcery.com> * 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 |