From 4bc8ae23877f08b24ee92b1c6400baa6b7b8a981 Mon Sep 17 00:00:00 2001
From: Phil Edwards <phil@codesourcery.com>
Date: Sat, 13 Sep 2003 20:58:27 +0000
Subject: [PATCH] run_doxygen: Clear GENERATE_TAGFILE entirely if man pages are
on.
2003-09-13 Phil Edwards <phil@codesourcery.com>
* docs/doxygen/run_doxygen: Clear GENERATE_TAGFILE entirely
if man pages are on.
* docs/doxygen/user.cfg.in: And here.
From-SVN: r71363
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/docs/doxygen/run_doxygen | 25 ++++++++++++++++---------
libstdc++-v3/docs/doxygen/user.cfg.in | 2 +-
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 034951775e96..50d24feb9c41 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-13 Phil Edwards <phil@codesourcery.com>
+
+ * docs/doxygen/run_doxygen: Clear GENERATE_TAGFILE entirely
+ if man pages are on.
+ * docs/doxygen/user.cfg.in: And here.
+
2003-09-10 Daniel Jacobowitz <drow@mvista.com>
Andreas Jaeger <aj@suse.de>
diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
index c1ae3cb5852e..a04c7e7bfbf8 100644
--- a/libstdc++-v3/docs/doxygen/run_doxygen
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -98,6 +98,7 @@ outdir=unset
do_html=false
do_man=false
enabled_sections=
+generate_tagfile=
DATEtext=`date '+%Y-%m-%d'`
parse_options $*
@@ -110,15 +111,20 @@ if test $srcdir = unset || test $outdir = unset || test $mode = unset; then
fi
case x"$mode" in
- xuser) do_html=true
- LEVELtext='User'
- ;;
- xmaint) do_html=true
- enabled_sections=maint
- LEVELtext='Maintainer'
- ;;
- xman) do_man=true
- ;;
+ xuser)
+ do_html=true
+ LEVELtext='User'
+ generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+ ;;
+ xmaint)
+ do_html=true
+ enabled_sections=maint
+ LEVELtext='Maintainer'
+ generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+ ;;
+ xman)
+ do_man=true
+ ;;
*)
echo run_doxygen error: $mode is an invalid mode 1>&2
exit 1 ;;
@@ -143,6 +149,7 @@ fi
-e "s=@enabled_sections@=${enabled_sections}=" \
-e "s=@do_html@=${do_html}=" \
-e "s=@do_man@=${do_man}=" \
+ -e "s=@generate_tagfile@=${generate_tagfile}=" \
${srcdir}/docs/doxygen/user.cfg.in > ${outdir}/${mode}.cfg
echo :: NOTE that this may take some time...
echo doxygen ${outdir}/${mode}.cfg
diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in
index 87653ebe512f..e606060b3c08 100644
--- a/libstdc++-v3/docs/doxygen/user.cfg.in
+++ b/libstdc++-v3/docs/doxygen/user.cfg.in
@@ -902,7 +902,7 @@ TAGFILES =
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE = @outdir@/@html_output_dir@/libstdc++.tag
+GENERATE_TAGFILE = @generate_tagfile@
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
# in the class index. If set to NO only the inherited external classes
--
GitLab