diff --git a/examples/cxx/Makefile.in b/examples/cxx/Makefile.in index ee49c15f8..3d68a674c 100755 --- a/examples/cxx/Makefile.in +++ b/examples/cxx/Makefile.in @@ -54,7 +54,18 @@ LCXX_END_LIBS = @LCXX_END_LIBS@ CANTERA_LIBDIR=@buildlib@ # required Cantera libraries -CANTERA_LIBS = +CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx + +CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/libkinetics.a \ + $(CANTERA_LIBDIR)/libtransport.a \ + $(CANTERA_LIBDIR)/libthermo.a \ + $(CANTERA_LIBDIR)/libctnumerics.a \ + $(CANTERA_LIBDIR)/libcvode.a \ + $(CANTERA_LIBDIR)/libctbase.a \ + $(CANTERA_LIBDIR)/libctmath.a \ + $(CANTERA_LIBDIR)/libtpx.a \ + $(CANTERA_LIBDIR)/libconverters.a + # the directory where Cantera include files may be found. CANTERA_INC=-I@ctroot@/build/include @@ -79,13 +90,11 @@ DEPENDS=$(OBJS:.o=.d) %.d: @CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d -$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a +$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \ $(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ \ $(LCXX_END_LIBS) -# Add an additional target for stability: -$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a clean: $(RM) $(OBJS) $(PROGRAM) diff --git a/examples/cxx/kinetics_example1.cpp b/examples/cxx/kinetics_example1.cpp index e3ccb5453..3e796bb8c 100755 --- a/examples/cxx/kinetics_example1.cpp +++ b/examples/cxx/kinetics_example1.cpp @@ -126,10 +126,7 @@ int kinetics_example1(int job) { << " kin1.csv (Excel CSV file)" << endl << " kin1.dat (Tecplot data file)" << endl; -#define DEBUG_HKM -#ifdef DEBUG_HKM delete gg; -#endif return 0; } diff --git a/examples/cxx/kinetics_example3.cpp b/examples/cxx/kinetics_example3.cpp index e2d1c359a..66e8953b7 100644 --- a/examples/cxx/kinetics_example3.cpp +++ b/examples/cxx/kinetics_example3.cpp @@ -120,10 +120,7 @@ int kinetics_example3(int job) { << " kin3.csv (Excel CSV file)" << endl << " kin3.dat (Tecplot data file)" << endl; -#define DEBUG_HKM -#ifdef DEBUG_HKM delete gg; -#endif return 0; } diff --git a/examples/cxx/rxnpath_example1.cpp b/examples/cxx/rxnpath_example1.cpp index b3c3f6ef9..2968cc7fd 100755 --- a/examples/cxx/rxnpath_example1.cpp +++ b/examples/cxx/rxnpath_example1.cpp @@ -101,7 +101,6 @@ int rxnpath_example1(int job) { // 3.0 IdealGasMix gas("gri30.cti", "gri30"); gas.setState_TPX(1001.0, OneAtm, "H2:2.0, O2:1.0, N2:4.0"); - int nsp = gas.nSpecies(); // create a reactor Reactor r;