From 7f88caa7822a5cfce766707839419c0d6696bc45 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 21 Jan 2008 21:17:52 +0000
Subject: [PATCH] Cantera.mak is starting to be operational with this checkin.
 This is a really good, simple way of creating executables that depend on
 Cantera.

---
 Cantera/cxx/include/Cantera.mak.in    |  15 ++--
 Cantera/cxx/include/Cantera_bt.mak.in | 105 +++++++++++++++++++++++---
 2 files changed, 105 insertions(+), 15 deletions(-)

diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in
index b03c7c254..dce207e8f 100644
--- a/Cantera/cxx/include/Cantera.mak.in
+++ b/Cantera/cxx/include/Cantera.mak.in
@@ -33,6 +33,8 @@ in_CanteraBuildTree = 0
 #     #include "cantera/kernel/HMWSoln.h"
 #
 CANTERA_INCROOTDIR= @ct_incroot@
+
+CANTERA_CORE_INCLUDES=-I$(CANTERA_INCROOTDIR)
 #
 # Library location
 #
@@ -46,7 +48,7 @@ CANTERA_CORE_LIBS= -L$(CANTERA_LIBSDIR) @CANTERA_CORE_LIBS@ -lctcxx
 #
 # Cantera Core Lib Dependencies
 #
-CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a
 
 #####################################################################
 #            BOOST
@@ -62,7 +64,7 @@ CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@
 #
 # Linkage extras for linking against boost
 #
-ifeq($(CANTERA_BOOST_LIB_DIR),"")
+ifeq ($(CANTERA_BOOST_LIB_DIR),"")
 CANTERA_BOOST_LIBS=
 else
 CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@
@@ -103,7 +105,7 @@ CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@
 CANTERA_build_with_f2c= @build_with_f2c@
 CANTERA_build_f2c_lib= @build_f2c_lib@
 
-ifeq($(CANTERA_build_f2c_lib), 1) 
+ifeq ($(CANTERA_build_f2c_lib), 1) 
 CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c
 else
 CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@
@@ -114,11 +116,14 @@ endif
 #      COMBINATIONS OF INCLUDES AND LIBS
 ####################################################################
 
-CANTERA_TOTAL_INCLUDES= $(CANTERA_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
+CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
 
+#
+# LIBS and LIBS should be the same ...
+#
 CANTERA_TOTAL_LIBS2 = @LOCAL_LIB_DIRS@ @LOCAL_LIBS@
 
-CANTERA_TOTAL_LIBS= $(CANTERA_LIBS) $(CANTERA_BOOST_LIBS) \
+CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \
                     $(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
                      $(CANTERA_F2C_LIBS)
 
diff --git a/Cantera/cxx/include/Cantera_bt.mak.in b/Cantera/cxx/include/Cantera_bt.mak.in
index 5d0bf8014..16935d65b 100644
--- a/Cantera/cxx/include/Cantera_bt.mak.in
+++ b/Cantera/cxx/include/Cantera_bt.mak.in
@@ -20,27 +20,112 @@
 #
 # This variable determines whether we are making this example in the
 # build tree environment or in the install tree environment.
+#
+in_CanteraBuildTree = 0
 
-in_CanteraBuildTree = 1
-
+###############################################################################
+#        CANTERA CORE 
+###############################################################################
 #
 # The directory where Cantera include files may be found.
+#  Include files in application programs should start with:
+#     #include "cantera/thermo.h"
+#     #include "cantera/kernel/HMWSoln.h"
 #
+CANTERA_INCROOTDIR= @ct_incroot@
 
-CANTERA_INCROOTDIR=@ctroot@/build/include
-CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
-
-# Library where the files are located
-CANTERA_LIBDIR=@buildlib@
+CANTERA_CORE_INCLUDES=-I$(CANTERA_INCROOTDIR)
+#
+# Library location
+#
+CANTERA_LIBSDIR= @ct_libdir@
 
 #
 # Required Cantera libraries
 #
-CANTERA_LIBS = -L$(CANTERA_LIBDIR) @LOCAL_LIBS@ -lctcxx
+CANTERA_CORE_LIBS= -L$(CANTERA_LIBSDIR) @CANTERA_CORE_LIBS@ -lctcxx
 
 #
-# Dependency line
+# Cantera Core Lib Dependencies
 #
-CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a
+
+#####################################################################
+#            BOOST
+####################################################################
+#
+# Cantera Boost Include
+#
+CANTERA_BOOST_INCLUDES= @BOOST_INCLUDE@
+#
+# Location of the boost library that Cantera linked against
+#
+CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@
+#
+# Linkage extras for linking against boost
+#
+ifeq ($(CANTERA_BOOST_LIB_DIR),"")
+CANTERA_BOOST_LIBS=
+else
+CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@
+endif
+
+#####################################################################
+#         CVODE/SUNDIALS LINKAGE
+####################################################################
+CANTERA_use_sundials = @use_sundials@
+
+#
+# Includes for Sundials - none for cvode
+#
+CANTERA_CVODE_INCLUDE=@sundials_include@
+#
+# Link line for cvode and sundials
+#
+ifeq ($(CANTERA_user_sundials), 1)
+
+else
+CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) @CVODE_LIBS@
+endif
 
 
+#######################################################################
+#         BLAS LAPACK LINKAGE
+#######################################################################
+CANTERA_build_lapack= @build_lapack@
+CANTERA_build_blas= @build_blas@
+
+CANTERA_BLAS_LAPACK_DIR= @BLAS_LAPACK_DIR@
+
+CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@
+
+#######################################################################
+#        CANTERA's F2C Linkage
+#######################################################################
+CANTERA_build_with_f2c= @build_with_f2c@
+CANTERA_build_f2c_lib= @build_f2c_lib@
+
+ifeq ($(CANTERA_build_f2c_lib), 1) 
+CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c
+else
+CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@
+endif
+
+
+#####################################################################
+#      COMBINATIONS OF INCLUDES AND LIBS
+####################################################################
+
+CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
+
+CANTERA_TOTAL_LIBS2 = @LOCAL_LIB_DIRS@ @LOCAL_LIBS@
+
+CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \
+                    $(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
+                     $(CANTERA_F2C_LIBS)
+
+#
+# Dependency Line
+#
+CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+