Makefile.in (tm.texi): Replace with rule for: ($(srcdir)/doc/tm.texi).

        * Makefile.in (tm.texi): Replace with rule for:
        ($(srcdir)/doc/tm.texi).
        (s-tm-texi): Depend on $(srcdir)/doc/../doc/tm.texi instead of on
        $(srcdir)/doc/tm.texi .
        (TEXI_GCCINT_FILES): Depend on $(srcdir)/doc/tm.texi instead of on
        tm.texi .

From-SVN: r166745

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08864a5bec1b7506adf5485a63ab0856f98a15c8..1d9d852e8c8e2d21be245d36683801a560c24314 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-15  Joern Rennecke  <amylaar@spamcop.net>
+
+       * Makefile.in (tm.texi): Replace with rule for:
+       ($(srcdir)/doc/tm.texi).
+       (s-tm-texi): Depend on $(srcdir)/doc/../doc/tm.texi instead of on
+       $(srcdir)/doc/tm.texi .
+       (TEXI_GCCINT_FILES): Depend on $(srcdir)/doc/tm.texi instead of on
+       tm.texi .
+
 2010-11-15  Richard Guenther  <rguenther@suse.de>
 
        PR lto/44150

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a43f434043fb357b6040f742d5be959067a9581c..28315012d4b0823d11a4026b6d4383aaa3bc6acc 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3689,7 +3689,8 @@ s-constrs-h: $(MD_DEPS) build/genpreds$(build_exeext)
        $(STAMP) s-constrs-h
 
 target-hooks-def.h: s-target-hooks-def-h; @true
-tm.texi: s-tm-texi
+# make sure that when we build info files, the used tm.texi is up to date.
+$(srcdir)/doc/tm.texi: s-tm-texi; @true
 
 s-target-hooks-def-h: build/genhooks$(build_exeext)
        $(RUN_GEN) build/genhooks$(build_exeext) > tmp-target-hooks-def.h
@@ -3698,7 +3699,8 @@ s-target-hooks-def-h: build/genhooks$(build_exeext)
        $(STAMP) s-target-hooks-def-h
 
 # check if someone mistakenly only changed tm.texi.
-s-tm-texi: $(srcdir)/doc/tm.texi
+# We use a different pathname here to avoid a circular dependency.
+s-tm-texi: $(srcdir)/doc/../doc/tm.texi
 
 s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
        $(RUN_GEN) build/genhooks$(build_exeext) \
@@ -4205,10 +4207,14 @@ TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi  \
         fdl.texi contrib.texi cppenv.texi cppopts.texi                 \
         implement-c.texi implement-cxx.texi arm-neon-intrinsics.texi
 
+# we explicitly use $(srcdir)/doc/tm.texi here to avoid confusion with
+# the generated tm.texi; the latter might have a more recent timestamp,
+# but we don't want to rebuild the info files unless the contents of
+# the *.texi files have changed.
 TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi          \
         contribute.texi makefile.texi configterms.texi options.texi    \
-        portability.texi interface.texi passes.texi    \
-        rtl.texi md.texi tm.texi hostconfig.texi fragments.texi        \
+        portability.texi interface.texi passes.texi rtl.texi md.texi   \
+        $(srcdir)/doc/tm.texi hostconfig.texi fragments.texi   \
         configfiles.texi collect2.texi headerdirs.texi funding.texi    \
         gnu.texi gpl_v3.texi fdl.texi contrib.texi languages.texi      \
         sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi   \