diff --git a/Cantera/src/converters/Makefile.in b/Cantera/src/converters/Makefile.in index 6e29d0e8f..9ec09ce83 100644 --- a/Cantera/src/converters/Makefile.in +++ b/Cantera/src/converters/Makefile.in @@ -37,7 +37,8 @@ host_triplet = @host@ subdir = Cantera/src/converters DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_split_version.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_prog_doxygen.m4 \ + $(top_srcdir)/m4/common/ax_split_version.m4 \ $(top_srcdir)/m4/config_summary.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -124,8 +125,32 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/Cantera/src/kinetics/Makefile.in b/Cantera/src/kinetics/Makefile.in index 68030d7b6..c40a67a9c 100644 --- a/Cantera/src/kinetics/Makefile.in +++ b/Cantera/src/kinetics/Makefile.in @@ -37,7 +37,8 @@ host_triplet = @host@ subdir = Cantera/src/kinetics DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_split_version.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_prog_doxygen.m4 \ + $(top_srcdir)/m4/common/ax_split_version.m4 \ $(top_srcdir)/m4/config_summary.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -124,8 +125,32 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/Cantera/src/spectra/Makefile.in b/Cantera/src/spectra/Makefile.in index f17d0d239..8169f4973 100644 --- a/Cantera/src/spectra/Makefile.in +++ b/Cantera/src/spectra/Makefile.in @@ -37,7 +37,8 @@ host_triplet = @host@ subdir = Cantera/src/spectra DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_split_version.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_prog_doxygen.m4 \ + $(top_srcdir)/m4/common/ax_split_version.m4 \ $(top_srcdir)/m4/config_summary.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -122,8 +123,32 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/Cantera/src/transport/Makefile.in b/Cantera/src/transport/Makefile.in index a7145b3a6..f856a731a 100644 --- a/Cantera/src/transport/Makefile.in +++ b/Cantera/src/transport/Makefile.in @@ -37,7 +37,8 @@ host_triplet = @host@ subdir = Cantera/src/transport DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_split_version.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_prog_doxygen.m4 \ + $(top_srcdir)/m4/common/ax_split_version.m4 \ $(top_srcdir)/m4/config_summary.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -125,8 +126,32 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/Makefile.am b/Makefile.am index eab36ef08..dd5e33329 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,7 @@ # Build in these directories: SUBDIRS = Cantera examples test_problems -#SUBDIRS += doxygen - +SUBDIRS += doxygen # Distribute these directories: DIST_SUBDIRS = Cantera examples diff --git a/configure.ac b/configure.ac index b5bf376a1..f40581b8f 100644 --- a/configure.ac +++ b/configure.ac @@ -42,25 +42,28 @@ AM_SANITY_CHECK # Doxygen support # ---------------- -# DX_DOXYGEN_FEATURE(ON) -# DX_HTML_FEATURE(ON) -# DX_CHM_FEATURE(OFF) -# DX_CHI_FEATURE(OFF) +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) -# DX_MAN_FEATURE(OFF) -# DX_RTF_FEATURE(OFF) -# DX_XML_FEATURE(OFF) -# DX_PDF_FEATURE(ON) -# DX_PS_FEATURE(OFF) -# DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(ON) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) # Generate Output Files -AC_OUTPUT(Makefile test_problems/Makefile examples/Makefile Cantera/Makefile \ - Cantera/src/Makefile Cantera/src/base/Makefile \ - Cantera/src/converters/Makefile Cantera/src/kinetics/Makefile \ - Cantera/src/numerics/Makefile Cantera/src/oneD/Makefile \ - Cantera/src/thermo/Makefile Cantera/src/transport/Makefile \ - Cantera/src/spectra/Makefile Cantera/src/zeroD/Makefile \ +AC_OUTPUT(Makefile test_problems/Makefile examples/Makefile \ + doxygen/Makefile \ + Cantera/Makefile \ + Cantera/src/Makefile Cantera/src/base/Makefile \ + Cantera/src/converters/Makefile \ + Cantera/src/kinetics/Makefile \ + Cantera/src/numerics/Makefile Cantera/src/oneD/Makefile \ + Cantera/src/thermo/Makefile \ + Cantera/src/transport/Makefile \ + Cantera/src/spectra/Makefile Cantera/src/zeroD/Makefile \ Cantera/src/equil/Makefile) # FINAL SUMMARY diff --git a/doxygen/cantera.dox b/doxygen/cantera.dox index be7ff3e88..e6fc49b8f 100644 --- a/doxygen/cantera.dox +++ b/doxygen/cantera.dox @@ -568,9 +568,8 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src/masa.h src/masa.f90 examples/pecos-input.txt \ - tutorial/laplacian.c tutorial/laplacian_utils.c tutorial/laplacian.h \ - $(SRCDIR)/doxygen/masa.page \ +INPUT = Cantera/src/kinetics/Kinetics.h \ + $(SRCDIR)/doxygen/cantera.page \ $(SRCDIR)/doxygen/fortran_interface.page \ $(SRCDIR)/doxygen/txt_common/acknowledgment.page \ $(SRCDIR)/doxygen/txt_common/gpl.page \ @@ -578,8 +577,8 @@ INPUT = src/masa.h src/masa.f90 examples/pecos-input.txt \ $(SRCDIR)/doxygen/txt_common/noop.page \ ./doxygen/txt_common/about_vpath.page \ $(SRCDIR)/doxygen/tutorial.page \ - $(SRCDIR)/doxygen/install.page \ - $(SRCDIR)/doxygen/add_sol.page \ + $(SRCDIR)/doxygen/install.page \ + $(SRCDIR)/doxygen/add_sol.page \ $(SRCDIR)/doxygen/solutions \ # This tag can be used to specify the character encoding of the source files @@ -1030,7 +1029,7 @@ PAPER_TYPE = $(PAPER_SIZE) # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = $(SRCDIR)/../../doxygen/masa +EXTRA_PACKAGES = $(SRCDIR)/../../doxygen/cantera # The LATEX_HEADER tag can be used to specify a personal LaTeX header for # the generated latex document. The header should contain everything until diff --git a/examples/cxx/examples.cpp b/examples/cxx/examples.cpp index d33460d72..00a5f52ca 100755 --- a/examples/cxx/examples.cpp +++ b/examples/cxx/examples.cpp @@ -3,8 +3,6 @@ using namespace Cantera; using namespace std; -//#include "ctexceptions.h" - // turn off warnings under Windows #ifdef WIN32 #pragma warning(disable:4786)