From 73e232f0c132517606797ea3dc4942d199f56284 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Wed, 14 Jan 2004 11:53:19 +0000 Subject: [PATCH] Makefile.in: Define MAINT from --enable-maintainer-mode. gcc/ 2004-01-14 Kelley Cook * Makefile.in: Define MAINT from --enable-maintainer-mode. gcc/ada/ 2004-01-14 Kelley Cook * Make-lang.in: Only regenerate texi files if --enable-maintainer-mode.\ From-SVN: r75860 --- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 3 +++ gcc/ada/ChangeLog | 4 ++++ gcc/ada/Make-lang.in | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c2e5a06d97a..3658a4f189f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-01-14 Kelley Cook + + * Makefile.in: Define MAINT from --enable-maintainer-mode. + 2004-01-14 Hartmut Penner * gcc/config/rs6000/rs6000.c (rs6000_stack_info) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 62b28b188a5..4d81b6d872e 100644 --- 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 4d8f668c94a..2156266d977 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2004-01-14 Kelley Cook + + * Make-lang.in: Only regenerate texi files if --enable-maintainer-mode. + 2004-01-13 Ed Schonberg * 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 bdd029298bb..4d9cf7a7cda 100644 --- 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 \ -- 2.30.2