From c5cd689da0935bede326a8ce64a3b277426bee5a Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Fri, 23 Jul 2004 04:28:44 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/matlab/setup_winmatlab.py | 4 ++-- tools/doc/Cantera.cfg | 2 +- tools/src/Makefile.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cantera/matlab/setup_winmatlab.py b/Cantera/matlab/setup_winmatlab.py index 979b213ec..69283e4b5 100644 --- a/Cantera/matlab/setup_winmatlab.py +++ b/Cantera/matlab/setup_winmatlab.py @@ -6,11 +6,11 @@ libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.4.0' incdir = '/Users/dgg/dv/sf/cantera/build/include' dflibdir = '' -bllibstr = "-llapack -lf77blas -lcblas -latlas" +bllibstr = "-lctlapack -lctblas" bllibs = bllibstr.replace('-l',' ') bllist = bllibs.split() -bldir = "/usr/lib/atlas" +bldir = "" libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes', 'cvode', 'ctmath', 'tpx'] diff --git a/tools/doc/Cantera.cfg b/tools/doc/Cantera.cfg index 912e12c3a..27dcc307f 100755 --- a/tools/doc/Cantera.cfg +++ b/tools/doc/Cantera.cfg @@ -969,7 +969,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = YES # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and diff --git a/tools/src/Makefile.in b/tools/src/Makefile.in index 4a1d9247d..85cdf0718 100755 --- a/tools/src/Makefile.in +++ b/tools/src/Makefile.in @@ -6,7 +6,7 @@ BINDIR = @buildbin@ build_ck = @BUILD_CK@ LCXX_FLAGS = -L$(LIBDIR) @CXXFLAGS@ -LOCAL_LIBS = -lcantera -lctcxx +LOCAL_LIBS = -lcantera -ltpx -lctcxx #LOCAL_LIBS = -lcantera @math_libs@ @BLAS_LAPACK_LIBS@ -lctcxx LCXX_END_LIBS = @LCXX_END_LIBS@ @@ -33,7 +33,7 @@ ck: $(BINDIR)/ck2cti $(BINDIR)/ck2cti: ck2cti.o $(CONVLIB_DEP) $(CANTERALIB_DEP) @CXX@ -o $(BINDIR)/ck2cti ck2cti.o $(LCXX_FLAGS) \ - -lconverters -lcantera -lctcxx $(LCXX_END_LIBS) + -lconverters -lcantera -ltpx -lctcxx $(LCXX_END_LIBS) $(BINDIR)/cti2ctml: cti2ctml.o $(CANTERALIB_DEP) @CXX@ -o $(BINDIR)/cti2ctml cti2ctml.o $(LCXX_FLAGS) $(LOCAL_LIBS) \