aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKelley Cook <kcook@gcc.gnu.org>2003-12-18 22:40:38 +0000
committerR. Kelley Cook <kcook@gcc.gnu.org>2003-12-18 22:40:38 +0000
commit90c2f1deb1fafada09dbac7858cdcc36029f577c (patch)
treee0247affc5176c6043e74ffbaf2e55decc1f36a9 /gcc
parent01d0a156a87faf436d7498ca73b67cc946c0a665 (diff)
downloadgcc-90c2f1deb1fafada09dbac7858cdcc36029f577c.zip
gcc-90c2f1deb1fafada09dbac7858cdcc36029f577c.tar.gz
gcc-90c2f1deb1fafada09dbac7858cdcc36029f577c.tar.bz2
gcc_update (files_generated): Add in gcc/ada/stamp-xgnatug and update gcc/ada/gnat_ug_* to use it.
contrib/ 2003-12-18 Kelley Cook <kcook@gcc.gnu.org> * gcc_update (files_generated): Add in gcc/ada/stamp-xgnatug and update gcc/ada/gnat_ug_* to use it. gcc/ada/ 2003-12-18 Kelley Cook <kcook@gcc.gnu.org> * stamp-xgnatug: New stamp file. * Make-lang.in (stamp-xgnatug): New stamp file and comment. (ada/doctools/xgnatug): Add $(build_exeext). (ada/gnat_ug_unx.texi, ada/gnat_ug_vwx.texi, ada/gnat_ug_vms.texi ada/gnat_ug_wnt.texi): Update to depend on stamp-xgnatug. From-SVN: r74808
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog8
-rw-r--r--gcc/ada/Make-lang.in54
-rw-r--r--gcc/ada/stamp-xgnatug1
3 files changed, 46 insertions, 17 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 365f4ca..3f7f504 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-18 Kelley Cook <kcook@gcc.gnu.org>
+
+ * stamp-xgnatug: New stamp file.
+ * Make-lang.in (stamp-xgnatug): New stamp file and comment.
+ (ada/doctools/xgnatug): Add $(build_exeext).
+ (ada/gnat_ug_unx.texi, ada/gnat_ug_vwx.texi, ada/gnat_ug_vms.texi
+ ada/gnat_ug_wnt.texi): Update to depend on stamp-xgnatug.
+
2003-12-17 Ed Falis <falis@gnat.com>
* a-elchha.adb (Tailored_Exception_Information): made Info constant to
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index cf50fb1..45e16f9 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -442,28 +442,48 @@ ada.generated-manpages:
# Generate documentation.
#
# The generated Texinfo files for the User Guide are stored in
-# $(srcdir), like the Info files.
+# $(srcdir). However, if the documentation files depended on
+# executables in the build tree, there'd be no way to ship a source
+# tree with the documentation already generated such that `make'
+# wouldn't attempt to rebuild it. So, we punt and arrange for the
+# documentation files to depend on a stamp file which has the
+# combined dependencies of the texi files and the generatator file.
+# This stamp file calls a submake to build the executable.
+#
+# If gnu make 3.80 is ever made a requirement to build, then
+# this dance could be avoided using an order-only dependency:
+#
+# $(srcdir)/ada/gnat_ug_unx.texi: \
+# ada/gnat_ug.texi ada/ug_words | ada/doctools/xgnatug$(build_exeext)
+
+$(srcdir)/ada/stamp-xgnatug: ada/xgnatug.adb ada/gnat_ug.texi ada/ug_words
+ $(MAKE) ada/doctools/xgnatug$(build_exeext)
+ $(STAMP) $(srcdir)/ada/stamp-xgnatug
-ada/doctools/xgnatug : ada/xgnatug.adb
+ada/doctools/xgnatug$(build_exeext): ada/xgnatug.adb
-$(MKDIR) ada/doctools
cp $^ ada/doctools
cd ada/doctools && gnatmake -q xgnatug
-$(srcdir)/ada/gnat_ug_unx.texi : ada/doctools/xgnatug \
- $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
- ada/doctools/xgnatug unx $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_unx.texi
-
-$(srcdir)/ada/gnat_ug_vms.texi : ada/doctools/xgnatug \
- $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
- ada/doctools/xgnatug vms $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_vms.texi
-
-$(srcdir)/ada/gnat_ug_vxw.texi : ada/doctools/xgnatug \
- $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
- ada/doctools/xgnatug vxworks $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_vxw.texi
-
-$(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug \
- $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
- ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi
+$(srcdir)/ada/gnat_ug_unx.texi: $(srcdir)/ada/stamp-xgnatug
+ ada/doctools/xgnatug unx $(srcdir)/ada/gnat_ug.texi \
+ $(srcdir)/ada/ug_words \
+ $(srcdir)/ada/gnat_ug_unx.texi
+
+$(srcdir)/ada/gnat_ug_vms.texi: $(srcdir)/ada/stamp-xgnatug
+ ada/doctools/xgnatug vms $(srcdir)/ada/gnat_ug.texi \
+ $(srcdir)/ada/ug_words \
+ $(srcdir)/ada/gnat_ug_vms.texi
+
+$(srcdir)/ada/gnat_ug_vxw.texi: $(srcdir)/ada/stamp-xgnatug
+ ada/doctools/xgnatug vxworks $(srcdir)/ada/gnat_ug.texi \
+ $(srcdir)/ada/ug_words \
+ $(srcdir)/ada/gnat_ug_vxw.texi
+
+$(srcdir)/ada/gnat_ug_wnt.texi: $(srcdir)/ada/stamp-xgnatug
+ ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi \
+ $(srcdir)/ada/ug_words \
+ $(srcdir)/ada/gnat_ug_wnt.texi
$(docobjdir)/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
diff --git a/gcc/ada/stamp-xgnatug b/gcc/ada/stamp-xgnatug
new file mode 100644
index 0000000..9788f70
--- /dev/null
+++ b/gcc/ada/stamp-xgnatug
@@ -0,0 +1 @@
+timestamp