This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[ada] Revert stamp-xgnatug related make-lang.in change
- From: Kelley Cook <kcook34 at ford dot com>
- To: Arnaud Charlet <charlet at ACT-Europe dot FR>
- Cc: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 05 Jan 2004 14:23:22 -0500
- Subject: [ada] Revert stamp-xgnatug related make-lang.in change
- Hop-count: 1
- Reply-to: Kelley Cook <kelleycook at yahoo dot com>
As requested, this patch reverts the stamp-xgnatug change that causes
problems for those building with a read-only directory.
I modified the comment to have a FIXME explaining the deficiency that
will again be present in the makefile.
OK to install?
Kelley Cook
contrib/
2004-01-05 Kelley Cook <kcook@gcc.gnu.org>
* gcc_update (files_generated): Revert 2003-12-18 change.
gcc/ada/
2004-01-05 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Revert stamp-xgnatug change from 2003-12-18.
Update comment and copyright date.
* stamp-xgnatug: Delete.
diff -uprN -x '*.[ch]' -x '*.ad?' gcc-orig/contrib/gcc_update gcc-new/contrib/gcc_update
--- gcc-orig/contrib/gcc_update 2003-12-19 00:50:14.000000000 -0500
+++ gcc-new/contrib/gcc_update 2004-01-05 12:33:37.974600000 -0500
@@ -79,11 +79,10 @@ gcc/fixinc/fixincl.x: gcc/fixinc/fixincl
gcc/f/intdoc.texi: gcc/f/intdoc.in gcc/f/intdoc.c gcc/f/intrin.h gcc/f/intrin.def
gcc/cp/cfns.h: gcc/cp/cfns.gperf
gcc/java/keyword.h: gcc/java/keyword.gperf
-gcc/ada/stamp-xgnatug: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
-gcc/ada/gnat_ug_unx.texi: gcc/ada/stamp-xgnatug
-gcc/ada/gnat_ug_vms.texi: gcc/ada/stamp-xgnatug
-gcc/ada/gnat_ug_vxw.texi: gcc/ada/stamp-xgnatug
-gcc/ada/gnat_ug_wnt.texi: gcc/ada/stamp-xgnatug
+gcc/ada/gnat_ug_unx.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+gcc/ada/gnat_ug_vms.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+gcc/ada/gnat_ug_vxw.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+gcc/ada/gnat_ug_wnt.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
# testsuite
# Without this, _Pragma3.c can have a false negative.
gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h
diff -uprN -x '*.[ch]' -x '*.ad?' gcc-orig/gcc/ada/Make-lang.in gcc-new/gcc/ada/Make-lang.in
--- gcc-orig/gcc/ada/Make-lang.in 2003-12-18 17:40:37.000000000 -0500
+++ gcc-new/gcc/ada/Make-lang.in 2004-01-05 13:57:26.395113600 -0500
@@ -1,6 +1,6 @@
# Top level -*- makefile -*- fragment for GNU Ada (GNAT).
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
#This file is part of GCC.
@@ -441,49 +441,40 @@ ada.generated-manpages:
# Generate documentation.
#
-# The generated Texinfo files for the User Guide are stored in
-# $(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.
+# The generated Texinfo files for the User Guide are stored in $(srcdir).
+#
+# FIXME: There is some ugliness here in that the aforementioned generated
+# documentation files depend on executables in the build tree. Since the
+# source directory is supposed to be read only it is difficult to ship a source
+# tree with the documentation already generated such that "make" will not
+# attempt to rebuild them.
#
-# If gnu make 3.80 is ever made a requirement to build, then
-# this dance could be avoided using an order-only dependency:
+# If gnu make 3.80 is ever made a requirement to build, then this 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$(build_exeext): ada/xgnatug.adb
-$(MKDIR) ada/doctools
cp $^ ada/doctools
cd ada/doctools && gnatmake -q xgnatug
-$(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
+$(srcdir)/ada/gnat_ug_unx.texi : ada/doctools/xgnatug$(build_exeext) \
+ $(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$(build_exeext) \
+ $(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$(build_exeext) \
+ $(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$(build_exeext) \
+ $(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
$(docobjdir)/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
diff -uprN -x '*.[ch]' -x '*.ad?' gcc-orig/gcc/ada/stamp-xgnatug gcc-new/gcc/ada/stamp-xgnatug
--- gcc-orig/gcc/ada/stamp-xgnatug 2003-12-31 11:44:13.000000000 -0500
+++ gcc-new/gcc/ada/stamp-xgnatug 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-timestamp