* Make-lang.in (doc/gnat_ugn_unw.texi): Eliminate explicit

dependency on xgnatugn, instead build it via a submake.
(ADA_INFOFILES): Add doc/gnat_ugn_unw.texi.

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 12669be..34e35b5 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-04  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (doc/gnat_ugn_unw.texi): Eliminate explicit
+       dependency on xgnatugn, instead build it via a submake.
+       (ADA_INFOFILES): Add doc/gnat_ugn_unw.texi.
+
 2004-07-04  Richard Henderson  <rth@redhat.com>
 
        * utils2.c (gnat_mark_addressable): Don't put_var_into_stack.

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 05ea6ea..60ee84b 100644 (file)
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -380,9 +380,13 @@ ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
        $(CP) $^ ada/doctools
        cd ada/doctools && gnatmake -q xgnatugn
 
-doc/gnat_ugn_unw.texi : ada/doctools/xgnatugn$(build_exeext) \
-       $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words
-       ada/doctools/xgnatugn unw $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi
+# Note that gnat_ugn_unw.texi does not depend on xgnatugn 
+# being built so we can distribute a pregenerated gnat_ugn_unw.info
+
+doc/gnat_ugn_unw.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words
+       $(MAKE) ada/doctools/xgnatugn$(build_exeext)
+       ada/doctools/xgnatugn unw $(srcdir)/ada/gnat_ugn.texi \
+          $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi
 
 doc/gnat_ugn_unw.info: doc/gnat_ugn_unw.texi \
    $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
@@ -407,7 +411,7 @@ doc/gnat-style.info: ada/gnat-style.texi $(docdir)/include/fdl.texi
             -I$(srcdir)/ada -o $@ $<; \
        else true; fi
 
-ADA_INFOFILES = doc/gnat_ugn_unw.info \
+ADA_INFOFILES = doc/gnat_ugn_unw.info doc/gnat_ugn_unw.texi \
                 doc/gnat_rm.info doc/gnat-style.info
 
 ada.info: $(ADA_INFOFILES)