* Makefile.in (info, maintainer-clean, install-info, uninstall):

	Also build and remove and install and uninstall c-tree.info and
	cppinternals.info.
	($(srcdir)/gcc.info): Add dependency on contrib.texi.
	($(srcdir)/cppinternals.info): New target.
	* c-tree.texi: Change file name used when makeinfo used without -o
	from ir.info to c-tree.info.  Add info directory entry.
	* cppinternals.texi: Add info directory entry.
	* .cvsignore: Update.

cp:
	* Make-lang.in (c++.info, c++.install-info): Build and install g++
	internals info.
	(c++.uninstall, c++.maintainer-clean): Remove g++ internals info.
	($(srcdir)/cp/g++int.info): New target.
	* gxxint.texi: Add info directory entry.  Use @@ in email address.
	* .cvsignore: Update.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38970 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 13 insertions, 4 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f0e7a8ef916..146fcf698ca 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2182,20 +2182,24 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
 # Remake the info files.
 
 doc: $(BUILD_INFO) gccbug
-info: $(srcdir)/cpp.info $(srcdir)/gcc.info lang.info $(srcdir)/c-tree.info
+info: $(srcdir)/cpp.info $(srcdir)/gcc.info lang.info $(srcdir)/c-tree.info $(srcdir)/cppinternals.info
 
 $(srcdir)/cpp.info: $(srcdir)/cpp.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cpp.info cpp.texi
 
 $(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
 	  $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
-	  $(srcdir)/tm.texi $(srcdir)/gcov.texi
+	  $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
 
 $(srcdir)/c-tree.info: $(srcdir)/c-tree.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o c-tree.info \
 		c-tree.texi
 
+$(srcdir)/cppinternals.info: $(srcdir)/cppinternals.texi
+	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cppinternals.info \
+		cppinternals.texi
+
 dvi: gcc.dvi cpp.dvi lang.dvi
 
 # This works with GNU Make's default rule.
@@ -2354,6 +2358,7 @@ maintainer-clean:
 	-rm -f cpp.??s cpp.*aux
 	-rm -f gcc.??s gcc.*aux
 	-rm -f $(srcdir)/cpp.info* $(srcdir)/gcc.info* $(srcdir)/c-tree.info*
+	-rm -f $(srcdir)/cppinternals.info*
 	-rm -f $(srcdir)/gcov.1 $(srcdir)/cpp.1
 #
 # Entry points `install' and `uninstall'.
@@ -2526,15 +2531,17 @@ install-driver: xgcc$(exeext)
 # to do the install.
 install-info: doc installdirs lang.install-info
 	-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
+	-rm -f $(infodir)/c-tree.info* $(infodir)/cppinternals.info*
 	if [ -f $(srcdir)/gcc.info ]; then \
-	  for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info*; do \
+	  for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info* \
+		$(srcdir)/c-tree.info* $(srcdir)/cppinternals.info*; do \
 	    realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
 	    $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
 	  done; \
 	else true; fi
 	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	  if [ -f $(infodir)/dir ] ; then \
-	    for f in cpp.info gcc.info; do \
+	    for f in cpp.info gcc.info c-tree.info cppinternals.info; do \
 		if [ -f $(infodir)/$$f ]; then \
 		  install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
 		else true; fi \
@@ -2542,6 +2549,7 @@ install-info: doc installdirs lang.install-info
 	  else true; fi; \
 	else true; fi;
 	-chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*
+	-chmod a-x $(infodir)/c-tree.info* $(infodir)/cppinternals.info*
 
 # Install the man pages.
 install-man: installdirs $(srcdir)/gcc.1 $(GENERATED_MANPAGES) lang.install-man
@@ -2673,6 +2681,7 @@ uninstall: intl.uninstall lang.uninstall $(UNINSTALL_CPP)
 	-rm -rf $(man1dir)/protoize$(manext)
 	-rm -rf $(man1dir)/unprotoize$(manext)
 	-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
+	-rm -f $(infodir)/c-tree.info* $(infodir)/cppinternals.info*
 #
 # These targets are for the dejagnu testsuites. The file site.exp
 # contains global variables that all the testsuites will use.