updated

examples/cxx/Makefile.in

@@ -56,7 +56,7 @@ CANTERA_LIBDIR=@buildlib@
 CANTERA_LIBS = 
 
 # the directory where Cantera include files may be found.
-CANTERA_INC=-I@ctroot@/build/include/cantera
+CANTERA_INC=-I@ctroot@/build/include
 
 # flags passed to the C++ compiler/linker for the linking step
 LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@

examples/cxx/equil_example1.cpp

@@ -16,12 +16,12 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
+#include <cantera/Cantera.h>
 #include <time.h>
 #include "example_utils.h"
-#include "equilibrium.h"
+#include <cantera/equilibrium.h>
 
-#include "IdealGasMix.h"
+#include <cantera/IdealGasMix.h>
 
 //-------------------------------------------------------------------
 

examples/cxx/example_utils.h

@@ -1,8 +1,8 @@
 #ifndef CT_EXAMPLE_UTILS_H
 #define CT_EXAMPLE_UTILS_H
 
-#include "kernel/Array.h"
-#include "kernel/plots.h"
+#include <cantera/kernel/Array.h>
+#include <cantera/kernel/plots.h>
 
 // Save the temperature, density, pressure, and mole fractions at one
 // time
@@ -50,7 +50,11 @@ void plotSoln(string fname, string fmt, string title, const G& gas, const A& sol
 
 inline void writeCanteraHeader(ostream& s) {
     s << endl;
-    s << "     Cantera version " << "CANTERA_VERSION" << endl;         
+#ifdef CANTERA_VERSION
+    s << "     Cantera version " << CANTERA_VERSION << endl;        
+#else
+    s << "     ???" << endl;
+#endif
     s << "     Copyright California Institute of Technology, 2002." << endl;
     s << "     http://www.cantera.org" << endl;
     s << endl;

examples/cxx/examples.cpp

@@ -1,5 +1,5 @@
 
-#include "Cantera.h"
+#include <cantera/Cantera.h>
 //#include "ctexceptions.h"
 
 // turn off warnings under Windows
@@ -61,7 +61,6 @@ int main(int argc, char** argv) {
     try {
 
         int i = 0;
-		int job = 2;
         if (example_num == 0) {
             int j;
             for (j = 0; j < NUM_EXAMPLES; j++) {

examples/cxx/kinetics_example1.cpp

@@ -16,9 +16,9 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
-#include "zerodim.h"
-#include "IdealGasMix.h"
+#include <cantera/Cantera.h>
+#include <cantera/zerodim.h>
+#include <cantera/IdealGasMix.h>
 #include <time.h>
 #include "example_utils.h"
 

examples/cxx/kinetics_example2.cpp

@@ -16,9 +16,9 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
-#include "GRI30.h"
-#include "zerodim.h"
+#include <cantera/Cantera.h>
+#include <cantera/GRI30.h>
+#include <cantera/zerodim.h>
 #include <time.h>
 #include "example_utils.h"
 

examples/cxx/rxnpath_example1.cpp

@@ -16,12 +16,12 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
-#include "zerodim.h"
+#include <cantera/Cantera.h>
+#include <cantera/zerodim.h>
 #include <time.h>
 #include "example_utils.h"
-#include "reactionpaths.h"
-#include "IdealGasMix.h"
+#include <cantera/reactionpaths.h>
+#include <cantera/IdealGasMix.h>
 
 // #include <iostream>
 // using namespace std;

examples/cxx/transport_example1.cpp

@@ -16,11 +16,11 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
-#include "transport.h"
+#include <cantera/Cantera.h>
+#include <cantera/transport.h>
 #include <time.h>
 #include "example_utils.h"
-#include "IdealGasMix.h"
+#include <cantera/IdealGasMix.h>
 
 template<class G, class V>
 void makeTransportDataLabels(const G& gas, V& names) {

examples/cxx/transport_example2.cpp

@@ -16,12 +16,12 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "Cantera.h"
-#include "transport.h"
+#include <cantera/Cantera.h>
+#include <cantera/transport.h>
 #include <time.h>
 #include "example_utils.h"
-#include "equilibrium.h"
-#include "IdealGasMix.h"
+#include <cantera/equilibrium.h>
+#include <cantera/IdealGasMix.h>
 
 template<class G, class V>
 void makeTransportDataLabels(const G& gas, V& names) {