From 35cc0d3bbc6d810d0a486516784a6ec04451bf85 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 14 Dec 2011 03:52:07 +0000
Subject: [PATCH] SCons now builds the binaries in the 'tools' directory

---
 Cantera/clib/SConscript |  2 +-
 Cantera/cxx/SConscript  |  2 +-
 SConstruct              |  3 +++
 buildutils.py           |  2 +-
 tools/SConscript        | 18 ++++++++++++++++++
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 tools/SConscript

diff --git a/Cantera/clib/SConscript b/Cantera/clib/SConscript
index f4d661794..7fecae25f 100644
--- a/Cantera/clib/SConscript
+++ b/Cantera/clib/SConscript
@@ -3,7 +3,7 @@ from buildutils import *
 Import('env', 'build')
 
 # (subdir, library name, (file extensions))
-libs = [LibOpts('src', 'clib')]
+libs = [BuildOpts('src', 'clib')]
 
 print os.getcwd()
 for lib in libs:
diff --git a/Cantera/cxx/SConscript b/Cantera/cxx/SConscript
index 9631ffae6..e98ee83ca 100644
--- a/Cantera/cxx/SConscript
+++ b/Cantera/cxx/SConscript
@@ -3,7 +3,7 @@ from buildutils import *
 Import('env', 'build')
 
 # (subdir, library name, (file extensions))
-libs = [LibOpts('src', 'ctcxx')]
+libs = [BuildOpts('src', 'ctcxx')]
 
 print os.getcwd()
 for lib in libs:
diff --git a/SConstruct b/SConstruct
index 15b1441ba..c3dfd6730 100644
--- a/SConstruct
+++ b/SConstruct
@@ -274,3 +274,6 @@ SConscript('Cantera/python/SConscript')
 
 if env['matlab_toolbox'] == 'y':
     SConscript('Cantera/matlab/SConscript')
+
+VariantDir('build/tools', 'tools', duplicate=0)
+SConscript('build/tools/SConscript')
diff --git a/buildutils.py b/buildutils.py
index 9db4c86d7..5ce676881 100644
--- a/buildutils.py
+++ b/buildutils.py
@@ -63,7 +63,7 @@ class CopyNoPrefix(object):
         shutil.copyfile(str(source[0]), pjoin(*targetpath[depth:]))
 
 
-class LibOpts(object):
+class BuildOpts(object):
     def __init__(self, subdir, name, exts=('cpp',), **kwargs):
         self.subdir = subdir
         self.name = name
diff --git a/tools/SConscript b/tools/SConscript
new file mode 100644
index 000000000..78b0bec31
--- /dev/null
+++ b/tools/SConscript
@@ -0,0 +1,18 @@
+from buildutils import *
+
+Import('env')
+localenv = env.Clone()
+
+bindir = pjoin('..','bin')
+
+localenv = env.Clone()
+localenv.Program(target=pjoin(bindir, 'cti2ctml'),
+                 source=['src/cti2ctml.cpp'],
+                 LIBS=['ctbase'])
+
+localenv.Program(target=pjoin(bindir, 'ck2cti'),
+                 source=['src/ck2cti.cpp'],
+                 LIBS=['converters','ctbase','tpx','ctcxx'])
+
+localenv.Program(target=pjoin(bindir, 'fixtext'),
+                 source=['src/fixtext.cpp'])