From 4b4fb7f3e1f23c4618d1b9e193f4464485fae70f Mon Sep 17 00:00:00 2001
From: Nicholas Malaya <nicholas.malaya@gmail.com>
Date: Thu, 5 Jan 2012 18:53:52 +0000
Subject: [PATCH] [cantera]: adding cxx example for regression testing

---
 examples/cxx/Makefile.am        | 25 ++++++++++++++++---------
 examples/cxx/equil_example1.cpp |  4 ++--
 examples/cxx/example_utils.h    |  4 ++--
 examples/cxx/examples.cpp       |  2 +-
 examples/cxx/flame1.cpp         |  6 +++---
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am
index ac8846a1c..33dc42f22 100644
--- a/examples/cxx/Makefile.am
+++ b/examples/cxx/Makefile.am
@@ -1,18 +1,25 @@
 h_sources  = example_utils.h
 
-cc_sources = equil_example1.cpp examples.cpp flame1.cpp kinetics_example1.cpp \
-	     kinetics_example2.cpp kinetics_example3.cpp rxnpath_example1.cpp \
-	     transport_example1.cpp transport_example2.cpp
+cc_sources = examples.cpp kinetics_example1.cpp kinetics_example2.cpp \
+	     kinetics_example3.cpp  equil_example1.cpp                \
+	     transport_example1.cpp transport_example2.cpp            \
+	     rxnpath_example1.cpp 
 
-INCLUDES                = -I../base -I../../build/include/
-AM_CXXFLAGS             = $(INCLUDES)
+LINK                 = -lkinetics -ltransport -lthermo -lctnumerics
+LINK                += -lctbase -ltpx -lctmath -lconverters 
+# -luser -lcvode -lctlapack -lctblas -lctf2c -lctcxx -luser -lstdc++
 
-bin_PROGRAMS            = cxx_examples
-library_includedir      = $(includedir)
+LIBS                 = -L$(top_builddir)/build/lib/ $(LINK)
+
+INCLUDES             = -I../base -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
+AM_CXXFLAGS          = $(INCLUDES)
+
+bin_PROGRAMS         = cxx_examples
+library_includedir   = $(includedir)
 
 #-----------------------
 # Cantera cxx examples
 #-----------------------
 
-cxx_examples_LDFLAGS      = $(all_libraries) -release $(GENERIC_RELEASE)
-cxx_examples_SOURCES      = $(cc_sources) $(h_sources)
+cxx_examples_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
+cxx_examples_SOURCES = $(cc_sources) $(h_sources)
diff --git a/examples/cxx/equil_example1.cpp b/examples/cxx/equil_example1.cpp
index 270cc3678..1ca0e6204 100755
--- a/examples/cxx/equil_example1.cpp
+++ b/examples/cxx/equil_example1.cpp
@@ -19,9 +19,9 @@
 #include <Cantera.h>
 #include <time.h>
 #include "example_utils.h"
-#include <cantera/equilibrium.h>
+#include <equilibrium.h>
 
-#include <cantera/IdealGasMix.h>
+#include <IdealGasMix.h>
 
 using namespace Cantera;
 using namespace Cantera_CXX;
diff --git a/examples/cxx/example_utils.h b/examples/cxx/example_utils.h
index 2439816e1..f0bfc667f 100755
--- a/examples/cxx/example_utils.h
+++ b/examples/cxx/example_utils.h
@@ -1,8 +1,8 @@
 #ifndef CT_EXAMPLE_UTILS_H
 #define CT_EXAMPLE_UTILS_H
 
-#include <cantera/kernel/Array.h>
-#include <cantera/kernel/plots.h>
+#include <kernel/Array.h>
+#include <kernel/plots.h>
 
 using namespace Cantera;
 using namespace std;
diff --git a/examples/cxx/examples.cpp b/examples/cxx/examples.cpp
index 00a5f52ca..4ca4ffa8b 100755
--- a/examples/cxx/examples.cpp
+++ b/examples/cxx/examples.cpp
@@ -1,5 +1,5 @@
 
-#include <cantera/Cantera.h>
+#include <Cantera.h>
 using namespace Cantera;
 using namespace std;
 
diff --git a/examples/cxx/flame1.cpp b/examples/cxx/flame1.cpp
index 2e21318ec..180ecb8f3 100644
--- a/examples/cxx/flame1.cpp
+++ b/examples/cxx/flame1.cpp
@@ -1,7 +1,7 @@
 
-#include "/Applications/Cantera/include/cantera/Cantera.h"
-#include "cantera/IdealGasMix.h"
-#include "cantera/transport.h"
+#include "Cantera.h"
+#include "IdealGasMix.h"
+#include "transport.h"
 
 int main() {