From a6ce39937467263b5d8a402b22935cb34a513847 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Sat, 28 Sep 2013 18:18:12 +0000
Subject: [PATCH] [Cython] Move extra Cython-related headers to main include
 directory

---
 .../cython/cantera => include/cantera/cython}/funcWrapper.h   | 0
 .../cython/cantera => include/cantera/cython}/wrappers.h      | 0
 interfaces/cython/cantera/_cantera.pxd                        | 4 ++--
 interfaces/cython/setup.py.in                                 | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {interfaces/cython/cantera => include/cantera/cython}/funcWrapper.h (100%)
 rename {interfaces/cython/cantera => include/cantera/cython}/wrappers.h (100%)

diff --git a/interfaces/cython/cantera/funcWrapper.h b/include/cantera/cython/funcWrapper.h
similarity index 100%
rename from interfaces/cython/cantera/funcWrapper.h
rename to include/cantera/cython/funcWrapper.h
diff --git a/interfaces/cython/cantera/wrappers.h b/include/cantera/cython/wrappers.h
similarity index 100%
rename from interfaces/cython/cantera/wrappers.h
rename to include/cantera/cython/wrappers.h
diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd
index 283eea156..3a0eeedc9 100644
--- a/interfaces/cython/cantera/_cantera.pxd
+++ b/interfaces/cython/cantera/_cantera.pxd
@@ -29,7 +29,7 @@ cdef extern from "cantera/thermo/mix_defs.h":
     cdef int kinetics_type_edge "Cantera::cEdgeKinetics"
 
 
-cdef extern from "funcWrapper.h":
+cdef extern from "cantera/cython/funcWrapper.h":
     ctypedef double (*callback_wrapper)(double, void*, void**)
     cdef int translate_exception()
 
@@ -498,7 +498,7 @@ cdef extern from "cantera/kinetics/ReactionPath.h":
         void build(CxxKinetics&, string&, CxxStringStream&, CxxReactionPathDiagram&, cbool)
 
 
-cdef extern from "wrappers.h":
+cdef extern from "cantera/cython/wrappers.h":
     # config definitions
     cdef string get_cantera_version()
     cdef int get_sundials_version()
diff --git a/interfaces/cython/setup.py.in b/interfaces/cython/setup.py.in
index df07de375..e83b9f6f3 100644
--- a/interfaces/cython/setup.py.in
+++ b/interfaces/cython/setup.py.in
@@ -62,4 +62,4 @@ setup(name="Cantera",
       package_data = {'cantera.data': ['*.*'],
                       'cantera.test.data': ['*.*'],
                       'cantera.examples': ['*/*.*'],
-                      'cantera': ['*.pxd', '*.h']})
+                      'cantera': ['*.pxd']})