*** empty log message ***

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

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)

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:

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():

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)

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"}
 
 #----------------------------------------------------------------------