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.


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

5 files changed, 40 insertions, 41 deletions

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index c2a29e1ed4b..3f1d98c9dcb 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-05  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* gcc_update (files_generated): Revert 2003-12-18 change.
+
 2004-01-03  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* gcc_update (files_and_dependencies): For gcc directory,
diff --git a/contrib/gcc_update b/contrib/gcc_update
index c4dd36e46c3..9d206c96749 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -79,11 +79,10 @@ gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def
 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 --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c554b7110aa..b213781c44b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2004-01-05  Robert Dewar  <dewar@gnat.com>
 
 	* 1ssecsta.ads: Default_Secondary_Stack is not a constant since it may
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 45e16f94335..052230baa8d 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -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).
+#
+# ??? 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 --git a/gcc/ada/stamp-xgnatug b/gcc/ada/stamp-xgnatug
deleted file mode 100644
index 9788f70238c..00000000000
--- a/gcc/ada/stamp-xgnatug
+++ /dev/null
@@ -1 +0,0 @@
-timestamp