configure.ac: Add install-html to target_list for Make-hooks.
* configure.ac: Add install-html to target_list for Make-hooks. * configure: Regenerate. * fortran/Make-lang.in (F95_HTMLFILES): New. (fortran.html): Use it. (fortran.install-html): New. * Makefile.in (install-html): Add lang.install-html. * java/Make-lang.in (JAVA_HTMLFILES): New. (java.html): Use it. (java.install-html): New. * objc/Make-lang.in (objc.install-html): New. * objcp/Make-lang.in (obj-c++.install-html): New. * cp/Make-lang.in (c++.install-html): New. * ada/gcc-interface/Make-lang.in (ada.install-html): New. * lto/Make-lang.in (lto.install-html): New. From-SVN: r155602
This commit is contained in:
Andrew Jenner
Andrew Jenner
parent
f0d61983a5
commit
55bcd32b46
|
|
@ -1,3 +1,20 @@
|
|||
2010-01-03 Andrew Jenner <andrew@codesourcery.com>
|
||||
|
||||
* configure.ac: Add install-html to target_list for Make-hooks.
|
||||
* configure: Regenerate.
|
||||
* fortran/Make-lang.in (F95_HTMLFILES): New.
|
||||
(fortran.html): Use it.
|
||||
(fortran.install-html): New.
|
||||
* Makefile.in (install-html): Add lang.install-html.
|
||||
* java/Make-lang.in (JAVA_HTMLFILES): New.
|
||||
(java.html): Use it.
|
||||
(java.install-html): New.
|
||||
* objc/Make-lang.in (objc.install-html): New.
|
||||
* objcp/Make-lang.in (obj-c++.install-html): New.
|
||||
* cp/Make-lang.in (c++.install-html): New.
|
||||
* ada/gcc-interface/Make-lang.in (ada.install-html): New.
|
||||
* lto/Make-lang.in (lto.install-html): New.
|
||||
|
||||
2010-01-03 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
PR lto/42520
|
||||
|
|
|
|||
|
|
@ -4061,8 +4061,7 @@ doc/gccinstall.pdf: $(TEXI_GCCINSTALL_FILES)
|
|||
|
||||
# List the directories or single hmtl files which are installed by
|
||||
# install-html. The lang.html file triggers language fragments to build
|
||||
# html documentation. Installing language fragment documentation is not
|
||||
# yet supported.
|
||||
# html documentation.
|
||||
HTMLS_INSTALL=$(build_htmldir)/cpp $(build_htmldir)/gcc \
|
||||
$(build_htmldir)/gccinstall $(build_htmldir)/gccint \
|
||||
$(build_htmldir)/cppinternals
|
||||
|
|
@ -4401,7 +4400,7 @@ install-pdf: $(PDFFILES) lang.install-pdf
|
|||
|
||||
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
|
||||
install-html: $(HTMLS_BUILD)
|
||||
install-html: $(HTMLS_BUILD) lang.install-html
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
|
||||
@list='$(HTMLS_INSTALL)'; for p in $$list; do \
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -626,6 +626,8 @@ ada.install-pdf: $(ADA_PDFFILES)
|
|||
|
||||
ada.html:
|
||||
|
||||
ada.install-html:
|
||||
|
||||
doc/gnat_ugn.dvi: doc/gnat_ugn.texi $(gcc_docdir)/include/fdl.texi \
|
||||
$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
|
||||
$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
|
||||
|
|
|
|||
|
|
@ -24842,8 +24842,8 @@ done
|
|||
rm -f Make-hooks
|
||||
touch Make-hooks
|
||||
target_list="all.cross start.encap rest.encap tags \
|
||||
install-common install-man install-info install-pdf dvi pdf \
|
||||
html uninstall info man srcextra srcman srcinfo \
|
||||
install-common install-man install-info install-pdf install-html dvi \
|
||||
pdf html uninstall info man srcextra srcman srcinfo \
|
||||
mostlyclean clean distclean maintainer-clean install-plugin"
|
||||
|
||||
for t in $target_list
|
||||
|
|
|
|||
|
|
@ -4134,8 +4134,8 @@ done
|
|||
rm -f Make-hooks
|
||||
touch Make-hooks
|
||||
target_list="all.cross start.encap rest.encap tags \
|
||||
install-common install-man install-info install-pdf dvi pdf \
|
||||
html uninstall info man srcextra srcman srcinfo \
|
||||
install-common install-man install-info install-pdf install-html dvi \
|
||||
pdf html uninstall info man srcextra srcman srcinfo \
|
||||
mostlyclean clean distclean maintainer-clean install-plugin"
|
||||
|
||||
for t in $target_list
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -121,6 +121,7 @@ c++.install-info:
|
|||
c++.dvi:
|
||||
c++.pdf:
|
||||
c++.install-pdf:
|
||||
c++.install-html:
|
||||
c++.html:
|
||||
c++.srcinfo:
|
||||
c++.srcextra:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -118,7 +118,27 @@ fortran.tags: force
|
|||
|
||||
fortran.info: doc/gfortran.info doc/gfc-internals.info
|
||||
fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi
|
||||
fortran.html: $(build_htmldir)/gfortran/index.html
|
||||
|
||||
F95_HTMLFILES = $(build_htmldir)/gfortran
|
||||
|
||||
fortran.html: $(F95_HTMLFILES)/index.html
|
||||
|
||||
fortran.install-html: $(F95_HTMLFILES)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
|
||||
@list='$(F95_HTMLFILES)'; for p in $$list; do \
|
||||
if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
|
||||
f=$(html__strip_dir) \
|
||||
if test -d "$$d$$p"; then \
|
||||
echo " $(mkinstalldirs) '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(mkinstalldirs) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
|
||||
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
|
||||
else \
|
||||
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
F95_PDFFILES = doc/gfortran.pdf
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -138,7 +138,9 @@ JAVA_PDFFILES = doc/gcj.pdf
|
|||
|
||||
java.pdf: $(JAVA_PDFFILES)
|
||||
|
||||
java.html: $(build_htmldir)/java/index.html
|
||||
JAVA_HTMLFILES = $(build_htmldir)/java
|
||||
|
||||
java.html: $(JAVA_HTMLFILES)/index.html
|
||||
|
||||
JAVA_MANFILES = doc/gcj.1 doc/jcf-dump.1 doc/gij.1 \
|
||||
doc/jv-convert.1 doc/grmic.1 \
|
||||
|
|
@ -205,6 +207,22 @@ java.install-pdf: $(JAVA_PDFFILES)
|
|||
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/gcc/$$f"; \
|
||||
done
|
||||
|
||||
java.install-html: $(JAVA_HTMLFILES)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
|
||||
@list='$(JAVA_HTMLFILES)'; for p in $$list; do \
|
||||
if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
|
||||
f=$(html__strip_dir) \
|
||||
if test -d "$$d$$p"; then \
|
||||
echo " $(mkinstalldirs) '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(mkinstalldirs) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
|
||||
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
|
||||
else \
|
||||
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
|
||||
fi; \
|
||||
done
|
||||
#
|
||||
# Clean hooks:
|
||||
# A lot of the ancillary files are deleted by the main makefile.
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ lto.dvi:
|
|||
lto.pdf:
|
||||
lto.install-pdf:
|
||||
lto.html:
|
||||
lto.install-html:
|
||||
lto.uninstall:
|
||||
lto.info:
|
||||
lto.man:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -95,6 +95,7 @@ objc.dvi:
|
|||
objc.pdf:
|
||||
objc.install-pdf:
|
||||
objc.html:
|
||||
objc.install-html:
|
||||
objc.man:
|
||||
objc.srcinfo:
|
||||
objc.srcman:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#
|
||||
# foo.all.cross, foo.start.encap, foo.rest.encap,
|
||||
# foo.install-common, foo.install-man, foo.install-info, foo.install-pdf,
|
||||
# foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.install-html, foo.info, foo.dvi, foo.pdf, foo.html, foo.uninstall,
|
||||
# foo.mostlyclean, foo.clean, foo.distclean,
|
||||
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
||||
#
|
||||
|
|
@ -104,6 +104,7 @@ obj-c++.dvi:
|
|||
obj-c++.pdf:
|
||||
obj-c++.install-pdf:
|
||||
obj-c++.html:
|
||||
obj-c++.install-html:
|
||||
obj-c++.srcinfo:
|
||||
obj-c++.srcextra:
|
||||
obj-c++.man:
|
||||
|
|
|
|||
Loading…
Reference in New Issue