From 6feaf20b827754c63b61e390ddb8e2794e0ac149 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Fri, 12 Sep 2003 11:31:48 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/matlab/Makefile.in    |  2 +-
 Cantera/python/Makefile.in    | 14 +++++++++-----
 Makefile.in                   |  6 +++++-
 apps/MixMaster/MechManager.py |  6 +++---
 apps/MixMaster/main.py        |  3 ++-
 configure                     |  2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Cantera/matlab/Makefile.in b/Cantera/matlab/Makefile.in
index 3cbaaf7b0..66d6cbb3c 100644
--- a/Cantera/matlab/Makefile.in
+++ b/Cantera/matlab/Makefile.in
@@ -32,7 +32,7 @@ os_is_win=@OS_IS_WIN@
 
 all: cantera/ctmethods.@mex_ext@
 
-cantera/ctmethods.@mex_ext@: $(SRCS) $(LIB_DEPS)
+cantera/ctmethods.@mex_ext@: $(SRCS)
 ifeq ($(os_is_win),0)
 	@PYTHON_CMD@ setup_matlab.py @prefix@/bin @buildlib@ @CT_SHARED_LIB@ '$(LIBS)'
 else
diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in
index 0fdfa24d8..bcf7a2436 100755
--- a/Cantera/python/Makefile.in
+++ b/Cantera/python/Makefile.in
@@ -29,17 +29,21 @@ SRCS = src/ctphase_methods.cpp \
 
 os_is_win = @OS_IS_WIN@
 
-all: _build
+all: _build 
+
+win: _winbuild
 
 _build: $(SRCS) $(LIB_DEPS)
 	touch src/pycantera.cpp 
-ifeq ($(os_is_win),0)
 	(@PYTHON_CMD@ setup.py build)
-else
+	echo 'ok' > _build
+
+
+_winbuild: $(SRCS)
+	touch src/pycantera.cpp 
 	cp -f winsetup.py setup.py
 	(@PYTHON_CMD@ setup.py build)
-endif
-	echo 'ok' > _build
+	echo 'ok' > _winbuild
 
 install:
 ifeq ($(os_is_win),0)
diff --git a/Makefile.in b/Makefile.in
index 984b6f769..60bffc537 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@ build_ck = @BUILD_CK@
 build_clib = @BUILD_CLIB@
 build_python = @BUILD_PYTHON@
 build_matlab = @BUILD_MATLAB@
+os_is_win = @OS_IS_WIN@
 
 LIBDIR=@LIB_DIR@
 
@@ -55,7 +56,6 @@ win-kernel-install:
 	@INSTALL@ -d @prefix@/lib/cantera
 	rm -f @prefix@/lib/cantera/*
 	@INSTALL@ -m 644 lib/*.lib @prefix@/lib/cantera
-	@INSTALL@ -m 644 lib/*.obj @prefix@/lib/cantera
 
 data-install:
 	@INSTALL@ -d @prefix@/cantera/data
@@ -89,7 +89,11 @@ hdr-collect:
 
 python: 
 ifeq ($(build_python),1)
+ifeq ($(os_is_win),0)
 	cd Cantera/python; @MAKE@
+else
+	cd Cantera/python; @MAKE@ win
+endif
 endif
 
 python-install:
diff --git a/apps/MixMaster/MechManager.py b/apps/MixMaster/MechManager.py
index 38e427fad..7599c2e64 100644
--- a/apps/MixMaster/MechManager.py
+++ b/apps/MixMaster/MechManager.py
@@ -7,9 +7,9 @@ import os
 
 # automatically-loaded mechanisms
 _autoload = [
-    (' GRI-Mech 3.0', 'gri30.xml'),
-    (' Air', 'air.xml'),
-    (' H/O/Ar', 'h2o2.xml')
+    (' GRI-Mech 3.0', 'gri30.cti'),
+    (' Air', 'air.cti'),
+    (' H/O/Ar', 'h2o2.cti')
     ] 
 
 def testit():
diff --git a/apps/MixMaster/main.py b/apps/MixMaster/main.py
index cb6ef056d..50b714c9d 100644
--- a/apps/MixMaster/main.py
+++ b/apps/MixMaster/main.py
@@ -45,7 +45,8 @@ class MixMaster:
 
     def openmech(self):
         from tkFileDialog import askopenfilename
-        pathname = askopenfilename(filetypes=[("XML Files", "*.xml *.ctml"),
+        pathname = askopenfilename(filetypes=[("Cantera Input Files", "*.cti"),
+                                              ("XML Files", "*.xml *.ctml"),
                                               ("All Files", "*.*")])
         if pathname:
             self.loadmech('', pathname)
diff --git a/configure b/configure
index 4a8de5187..53e943a76 100755
--- a/configure
+++ b/configure
@@ -58,7 +58,7 @@ BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"}
 # Set this to "y" if you want to build the Matlab toolbox. Matlab must
 # be installed on your system first, since the build process runs a
 # Matlab script.
-PYTHON_CMD=${PYTHON_CMD:="/usr/local/bin/python"}
+PYTHON_CMD=${PYTHON_CMD:="python"}
 BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
 
 #----------------------------------------------------------------------