[v3] let doxygen find generated header files
Matthias Klose
doko@cs.tu-berlin.de
Tue Nov 16 08:10:00 GMT 2004
Phil Edwards writes:
> On Sat, Nov 13, 2004 at 03:15:17PM +0100, Matthias Klose wrote:
> > The current setup hardcodes i686-pc-linux-gnu in the doxyfile and lets
> > doxygen fail on other setups. Pass the current configuration from the
> > Makefile to run_doxygen and use it for doxygen.
> >
> > Ok to checkin?
>
> Looks good, thanks!
Adjusted the patch as commented by Benjamin.
Matthias
2004-11-16 Matthias Klose <doko@debian.org>
* Makefile.am (doxygen, doxygen-maint, doxygen-man): Use host_alias
instead of build_alias.
* docs/doxygen/run_doxygen: Likewise.
* docs/doxygen/user.cfg.in: Likewise.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.am,v
retrieving revision 1.52
diff -u -r1.52 Makefile.am
--- Makefile.am 15 Nov 2004 21:59:18 -0000 1.52
+++ Makefile.am 16 Nov 2004 07:52:53 -0000
@@ -35,21 +35,21 @@
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=user $${srcdir} $${builddir})
doxygen-maint:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=maint $${srcdir} $${builddir})
doxygen-man:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=man $${srcdir} $${builddir})
.PHONY: doxygen doxygen-maint doxygen-man
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.in,v
retrieving revision 1.148
diff -u -r1.148 Makefile.in
--- Makefile.in 15 Nov 2004 21:59:18 -0000 1.148
+++ Makefile.in 16 Nov 2004 07:52:53 -0000
@@ -746,21 +746,21 @@
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=user $${srcdir} $${builddir})
doxygen-maint:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=maint $${srcdir} $${builddir})
doxygen-man:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`${PWD_COMMAND}`; \
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
- --build_alias=$(build_alias) \
+ --host_alias=$${host_alias} \
--mode=man $${srcdir} $${builddir})
.PHONY: doxygen doxygen-maint doxygen-man
Index: docs/doxygen/run_doxygen
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/doxygen/run_doxygen,v
retrieving revision 1.29
diff -u -r1.29 run_doxygen
--- docs/doxygen/run_doxygen 15 Nov 2004 21:59:17 -0000 1.29
+++ docs/doxygen/run_doxygen 16 Nov 2004 07:52:54 -0000
@@ -3,7 +3,7 @@
# Runs doxygen and massages the output files.
# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
#
-# Synopsis: run_doxygen --mode=[user|maint|man] --build_alias=<alias> \
+# Synopsis: run_doxygen --mode=[user|maint|man] --host_alias=<alias> \
# v3srcdir v3builddir
#
# Originally hacked together by Phil Edwards <pme@gcc.gnu.org>
@@ -44,7 +44,7 @@
print_usage() {
cat 1>&2 <<EOF
-Usage: run_doxygen --mode=MODE --build_alias=BUILD_ALIAS [<options>]
+Usage: run_doxygen --mode=MODE --host_alias=BUILD_ALIAS [<options>]
<v3-src-dir> <v3-build-dir>
MODE is one of:
user Generate user-level HTML library documentation.
@@ -76,9 +76,9 @@
case "$o" in
--mode=*)
mode=$arg ;;
- --build_alias=*)
- build_alias=$arg ;;
- --mode | --build_alias | --help | -h)
+ --host_alias=*)
+ host_alias=$arg ;;
+ --mode | --host_alias | --help | -h)
print_usage ;;
*)
# this turned out to be a mess, maybe change to --srcdir=, etc
@@ -99,7 +99,7 @@
# script begins here
mode=unset
-build_alias=unset
+host_alias=unset
srcdir=unset
outdir=unset
do_html=false
@@ -111,7 +111,7 @@
parse_options $*
find_doxygen
-if test $srcdir = unset || test $outdir = unset || test $mode = unset || test $build_alias = unset; then
+if test $srcdir = unset || test $outdir = unset || test $mode = unset || test $host_alias = unset; then
# this could be better
echo run_doxygen error: You have not given enough information...! 1>&2
print_usage
@@ -152,7 +152,7 @@
cd $builddir
sed -e "s=@outdir@=${outdir}=g" \
-e "s=@srcdir@=${srcdir}=g" \
- -e "s=@build_alias@=${build_alias}=g" \
+ -e "s=@host_alias@=${host_alias}=g" \
-e "s=@html_output_dir@=html_${mode}=" \
-e "s=@enabled_sections@=${enabled_sections}=" \
-e "s=@do_html@=${do_html}=" \
Index: docs/doxygen/user.cfg.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/doxygen/user.cfg.in,v
retrieving revision 1.33
diff -u -r1.33 user.cfg.in
--- docs/doxygen/user.cfg.in 15 Nov 2004 21:59:17 -0000 1.33
+++ docs/doxygen/user.cfg.in 16 Nov 2004 07:52:54 -0000
@@ -113,7 +113,7 @@
include/ext/slist \
include/tr1/array \
include/tr1/tuple \
- include/@build_alias@/bits
+ include/@host_alias@/bits
FILE_PATTERNS = *.h \
*.tcc
RECURSIVE = NO
More information about the Libstdc++
mailing list