From a1641019dd636670d6a9721c1100f776faf23ab7 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 11 Apr 2012 17:37:30 +0000
Subject: [PATCH] Made dependency of Matlab extension on the Cantera library
 explicit

---
 src/SConscript        |  1 +
 src/matlab/SConscript | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/SConscript b/src/SConscript
index 9753cfdd5..7115d14ce 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -53,6 +53,7 @@ lib = build(localenv.StaticLibrary('../lib/cantera', libraryTargets,
                                    SPAWN=getSpawn(localenv)))
 localenv.Depends(lib, localenv['config_h_target'])
 install('$inst_libdir', lib)
+env['cantera_staticlib'] = lib
 
 # OS X requires the shared libraries at link time
 if (localenv['use_sundials'] == 'y' and
diff --git a/src/matlab/SConscript b/src/matlab/SConscript
index d839710b9..259e718fc 100644
--- a/src/matlab/SConscript
+++ b/src/matlab/SConscript
@@ -50,7 +50,8 @@ mexSuffix = '.mex%s%i' % (mexPlatform, localenv['OS_BITS'])
 
 localenv.Append(CPPPATH=['#include', '#src', matlab_include],
                 CPPDEFINES=['MATLAB_MEX_FILE'],
-                LIBPATH=[matlab_libs])
+                LIBPATH=[matlab_libs],
+                LINKFLAGS=linkflags)
 
 linklibs += localenv['sundials_libs']
 linklibs += localenv['blas_lapack_libs']
@@ -60,8 +61,12 @@ ctmethods = build(localenv.SharedLibrary('#interfaces/matlab/toolbox/ctmethods',
                                          LIBPREFIX='',
                                          SHLIBPREFIX='',
                                          SHLIBSUFFIX=mexSuffix,
-                                         LIBS=linklibs,
-                                         LINKFLAGS=linkflags))
+                                         LIBS=linklibs))
+
+if localenv['OS'] in ('Windows', 'Darwin'):
+    localenv.Depends(ctmethods, localenv['cantera_shlib'])
+else:
+    localenv.Depends(ctmethods, localenv['cantera_staticlib'])
 
 env['matlab_extension'] = ctmethods