Makefile.in: Define MAINT from --enable-maintainer-mode.

gcc/
2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in: Define MAINT from --enable-maintainer-mode.

gcc/ada/
2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in: Only regenerate texi files if --enable-maintainer-mode.\

From-SVN: r75860

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2e5a06d97adf437c16024125750de7ee8111376..3658a4f189f8881a514efe02c0a08a2b2e02eb7f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Makefile.in: Define MAINT from --enable-maintainer-mode.
+
 2004-01-14  Hartmut Penner  <hpenner@de.ibm.com>
 
        * gcc/config/rs6000/rs6000.c (rs6000_stack_info)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 62b28b188a503e1dddf886e8d9fca375a194b4bb..4d81b6d872edad7c55c8d2acb7bedd587e994032 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -169,6 +169,9 @@ STRICT2_WARN = -pedantic -Wno-long-long -Wold-style-definition @WERROR@
 # "extern" tags in header files.
 NOCOMMON_FLAG = @nocommon_flag@
 
+# This is set by --disable-maintainer-mode (default) to "#"
+MAINT = @MAINT@
+
 # These are set by --enable-checking=valgrind.
 RUN_GEN = @valgrind_command@
 VALGRIND_DRIVER_DEFINES = @valgrind_path_defines@

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4d8f668c94a3e8931c2f22db7d3f3ae8d654db9e..2156266d9772147000798316ad13c8ea815cec25 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in: Only regenerate texi files if --enable-maintainer-mode.
+
 2004-01-13  Ed Schonberg  <schonberg@gnat.com>
 
        * exp_ch3.adb (Build_Assignment): Fix bug in handling of controlled

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index bdd029298bb2374975580b90789fc11477769b26..4d9cf7a7cda3373c336771cd57dddf5b22b90042 100644 (file)
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -449,12 +449,15 @@ ada.generated-manpages:
 # tree with the documentation already generated such that "make" will not
 # attempt to rebuild them.
 # 
+# As a compromise this only will execute with --enable-maintainer mode.
+#
 # 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)
 
+ifndef MAINT
 ada/doctools/xgnatug$(build_exeext): ada/xgnatug.adb
        -$(MKDIR) ada/doctools
        cp $^ ada/doctools
@@ -475,6 +478,7 @@ $(srcdir)/ada/gnat_ug_vxw.texi : ada/doctools/xgnatug$(build_exeext) \
 $(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
+endif
 
 $(docobjdir)/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
        $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \