From 55bcd32b46f7f5a10d947ddb53b20f6aee003b27 Mon Sep 17 00:00:00 2001
From: Andrew Jenner <andrew@codesourcery.com>
Date: Mon, 4 Jan 2010 01:36:36 +0000
Subject: [PATCH] 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
---
gcc/ChangeLog | 17 +++++++++++++++++
gcc/Makefile.in | 5 ++---
gcc/ada/gcc-interface/Make-lang.in | 4 +++-
gcc/configure | 4 ++--
gcc/configure.ac | 4 ++--
gcc/cp/Make-lang.in | 3 ++-
gcc/fortran/Make-lang.in | 24 ++++++++++++++++++++++--
gcc/java/Make-lang.in | 22 ++++++++++++++++++++--
gcc/lto/Make-lang.in | 1 +
gcc/objc/Make-lang.in | 3 ++-
gcc/objcp/Make-lang.in | 3 ++-
11 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6922745d681e..c7e8c96348f7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 10638ef70d4a..98228a829c2f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -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 \
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index d57c1f0032c5..a0e02e96880f 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -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 $@ $<
diff --git a/gcc/configure b/gcc/configure
index 7a667851e27a..4cb6cf77f8dd 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -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
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 9622c23fd36f..1d9d13ecece1 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -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
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 9b134edee616..e3a0782f1725 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -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:
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 38041f095358..9b8cce2e6593 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -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
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index a56e2b62943c..107977d2fed9 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -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.
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index bdb694ce0661..b6c2bce0e797 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -44,6 +44,7 @@ lto.dvi:
lto.pdf:
lto.install-pdf:
lto.html:
+lto.install-html:
lto.uninstall:
lto.info:
lto.man:
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index a09849717b2b..71f8ad8aa9c0 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -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:
diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in
index 09af104f0a6a..e9abb8901f61 100644
--- a/gcc/objcp/Make-lang.in
+++ b/gcc/objcp/Make-lang.in
@@ -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:
--
GitLab