--enable-multithreading Set compiler flags to allow for multithreaded programs"
ac_help="$ac_help
--with-multithreading=DIR use DIR as path to the ACE library"
+ac_help="$ac_help
+ --with-kdoc=DIR use kdoc installed in DIR"
ac_help="$ac_help
--enable-shared Set compiler flags to generate shared libraries"
ac_help="$ac_help
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:556: checking for $ac_word" >&5
+echo "configure:558: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:586: checking for $ac_word" >&5
+echo "configure:588: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:637: checking for $ac_word" >&5
+echo "configure:639: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:669: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 680 "configure"
+#line 682 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:716: checking whether we are using GNU C" >&5
+echo "configure:718: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:744: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:783: checking for $ac_word" >&5
+echo "configure:785: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:815: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 826 "configure"
+#line 828 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:857: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:859: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:862: checking whether we are using GNU C++" >&5
+echo "configure:864: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:890: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:892: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:953: checking for $ac_word" >&5
+echo "configure:955: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test $withmultithreading != no ; then
echo $ac_n "checking for ACE""... $ac_c" 1>&6
-echo "configure:1008: checking for ACE" >&5
+echo "configure:1010: checking for ACE" >&5
if test -d $withmultithreading ; then
echo "$ac_t""found" 1>&6
else
fi
+# Check whether --with-kdoc or --without-kdoc was given.
+if test "${with_kdoc+set}" = set; then
+ withval="$with_kdoc"
+ kdocdir=$withval
+else
+ kdocdir=doc/auto/scripts/kdoc
+fi
+
+if test -r $kdocdir/kdoc ; then
+ echo "$ac_t""found" 1>&6
+else
+ echo "$ac_t""not found" 1>&6
+ { echo "configure: error: Invalid kdoc path" 1>&2; exit 1; }
+fi
+if test -r $kdocdir/Version ; then
+ kdocversion=`cat $kdocdir/Version` ;
+else
+ kdocversion=1;
+fi
+
+
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
ac_given_srcdir=$srcdir
-trap 'rm -fr `echo "common/Make.global_options doc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "common/Make.global_options doc/Makefile doc/auto/kdoc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@PERL@%$PERL%g
s%@enablemultithreading@%$enablemultithreading%g
s%@withmultithreading@%$withmultithreading%g
+s%@kdocdir@%$kdocdir%g
+s%@kdocversion@%$kdocversion%g
s%@enableshared@%$enableshared%g
s%@enablemultigrid@%$enablemultigrid%g
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"common/Make.global_options doc/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"common/Make.global_options doc/Makefile doc/auto/kdoc/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
# Makefile,v 1.8 1999/04/15 17:36:14 wolf Exp
-
-##########################################################################
-# Change this section only, if you want to add a documentation library #
-##########################################################################
-#
# specify which are the include files that a specific documentation libary
# depends upon
kdoc.base = $(shell echo ../../base/include/base/*.h)
# deal.II library into just one file
kdoc.dealII = $(kdoc.grid) $(kdoc.dof) $(kdoc.numerics)
-# specify the names of the resulting doc libraries
-kdoc.library-files = kdoc/base.kdoc \
- kdoc/lac.kdoc \
- kdoc/basic.kdoc \
- kdoc/grid.kdoc \
- kdoc/dof.kdoc \
- kdoc/numerics.kdoc \
- kdoc/multigrid.kdoc
-
-##########################################################################
-# End of changeable section #
-##########################################################################
-
-
# include global paths and variables
include ../../common/Make.global_options
-# make rule names to rerun the generation of a library
-kdoc.library-files.rerun = $(kdoc.library-files:%.kdoc=%.kdoc.rerun)
-
-
-KDOCFLAGS = -I../scripts/kdoc ../scripts/kdoc/kdoc -a -p
-#KDOCFLAGS = /home/people/wolf/var/kdoc/kdoc2/bin/kdoc -a -p \
-# --html-logo=../../../pictures/deal.II_3.0_2.150.jpg
ifeq ($(shell uname),SunOS)
DOCPP = /home/people/wolf/Config/doc++/bin/doc++
#DOCPP = /home/people/kanschat/bin/doc++
## targets for kdoc generated HTML output
#################################################################################
-# make the .kdoc files twice: once without and a second time with
-# crossreferencing the other libraries
-kdoc: $(kdoc.library-files) $(kdoc.library-files.rerun)
+# Make in kdoc subdirectory
+kdoc:
+ @cd kdoc ; $(MAKE)
-# rule how to generate the documentation the first time, i.e. without
-# crossreferencing the other doc-libraries. we do not try to make it
-# dependent on anything, since it needs to be generated anyway
-#
-# since the rule is a rather complex one, involving the computation of
-# variable names, here is the stripped down version for the base library:
-# kdoc/base.kdoc:
-# @cd kdoc ; $(PERL) $(KDOCFLAGS) -dbase \
-# base $(kdoc.base:../..%=../../..%)
-$(kdoc.library-files):
- @cd kdoc ; \
- $(PERL) $(KDOCFLAGS) \
- -d$(subst .kdoc,,$(subst kdoc/,,$@)) \
- $(subst .kdoc,,$(subst kdoc/,,$@)) \
- $($(subst /,.,$(subst .kdoc,,$@)):../..%=../../..%)
-
-# rule how to generate the documentation the second time, i.e. with
-# crossreferencing the other doc-libraries this time. the rule is
-# similar to the above one, but includes the other libraries
-$(kdoc.library-files.rerun):
- @cd kdoc ; \
- $(PERL) $(KDOCFLAGS) $(kdoc.library-files:kdoc/%.kdoc=-l%) \
- -d$(subst .kdoc.rerun,,$(subst kdoc/,,$@)) \
- $(subst .kdoc.rerun,,$(subst kdoc/,,$@)) \
- $($(subst /,.,$(subst .kdoc.rerun,,$@)):../..%=../../..%)
-
+# Will not work for kdoc2
kdoc/names.html: $(kdoc.libray-files)
@cd kdoc ; $(PERL) ../scripts/index.pl *.kdoc > names.html
--- /dev/null
+############################################################
+# $Id$
+############################################################
+
+D = @DEAL2_DIR@
+multigrid = @enablemultigrid@
+kdocdir = $D/@kdocdir@
+kdocversion = @kdocversion@
+
+
+include $D/common/Make.global_options
+
+KDOCFLAGS=-I$(kdocdir) $(kdocdir)/kdoc -a -p -L $D/doc/auto/kdoc
+
+kdoc.base = $(shell echo $D/base/include/base/*.h)
+kdoc.lac = $(shell echo $D/lac/include/lac/*.h)
+kdoc.grid = $(shell echo $D/deal.II/include/grid/*.h)
+kdoc.dof = $(shell echo $D/deal.II/include/dofs/*.h) \
+ $(shell echo $D/deal.II/include/fe/*.h)
+kdoc.numerics = $(shell echo $D/deal.II/include/numerics/*.h)
+kdoc.multigrid= $(shell echo $D/deal.II/include/multigrid/*.h)
+
+
+# for latex-output, we join the different libraries of the
+# deal.II library into just one file
+kdoc.dealII = $(kdoc.grid) $(kdoc.dof) $(kdoc.numerics)
+
+# specify the names of the resulting doc libraries
+ifeq ($(multigrid),yes)
+kdoc.library-files = base.kdoc \
+ lac.kdoc \
+ grid.kdoc \
+ dof.kdoc \
+ numerics.kdoc \
+ multigrid.kdoc
+else
+kdoc.library-files = base.kdoc \
+ lac.kdoc \
+ grid.kdoc \
+ dof.kdoc \
+ numerics.kdoc
+endif
+
+kdoc: $(kdoc.library-files)
+
+base.kdoc: $(kdoc.base)
+ @$(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ $^
+
+lac.kdoc: $(kdoc.lac)
+ @$(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ -l base $^
+
+grid.kdoc: $(kdoc.grid)
+ @$(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ -l base $^
+
+dof.kdoc: $(kdoc.dof)
+ $(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ -l base -llac -lgrid $^
+
+numerics.kdoc: $(kdoc.numerics)
+ @$(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ -l base -llac -lgrid -ldof $^
+
+multigrid.kdoc: $(kdoc.multigrid)
+ @$(PERL) $(KDOCFLAGS) $(subst .kdoc,,$@) -d $(subst .kdoc,,$@) -L . \
+ -l base -llac -lgrid -ldof -lnumerics $^
projects / dealii.git / commitdiff