OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.am (doxygen, [...]): Use host_alias instead of build_alias. 

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.

From-SVN: r90719
This commit is contained in:
Matthias Klose 2004-11-16 08:03:19 +00:00 committed by Matthias Klose
parent 6917e65713
commit 7e7432e255
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
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.
2004-11-15 Paolo Carlini <pcarlini@suse.de>
* include/bits/streambuf.tcc (__copy_streambufs): Provide

6
libstdc++-v3/Makefile.am
View File

@ -35,21 +35,21 @@ doxygen:
-(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

6
libstdc++-v3/Makefile.in
View File

@ -746,21 +746,21 @@ doxygen:
-(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

16
libstdc++-v3/docs/doxygen/run_doxygen
View File

@ -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 @@ find_doxygen() {
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 @@ parse_options() {
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 @@ parse_options() {
# script begins here
mode=unset
build_alias=unset
host_alias=unset
srcdir=unset
outdir=unset
do_html=false
@ -111,7 +111,7 @@ DATEtext=`date '+%Y-%m-%d'`
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 @@ fi
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}=" \

2
libstdc++-v3/docs/doxygen/user.cfg.in
View File

@ -113,7 +113,7 @@ INPUT = @srcdir@/docs/doxygen/doxygroups.cc \
include/ext/slist \
include/tr1/array \
include/tr1/tuple \
include/@build_alias@/bits
include/@host_alias@/bits
FILE_PATTERNS = *.h \
*.tcc
RECURSIVE = NO