diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in index 78be58159..f3afb3f16 100755 --- a/Cantera/python/Makefile.in +++ b/Cantera/python/Makefile.in @@ -35,6 +35,11 @@ SRCS = src/ctphase_methods.cpp \ os_is_win = @OS_IS_WIN@ use_clib_dll = @USE_CLIB_DLL@ +#LOCAL_DEFS=-DDEBUG_MODE +PIC_FLAG=@PIC@ + +CXX_FLAGS= @CXXFLAGS@ $(LOCAL_DEFS) $(PIC_FLAG) + all: _build win: _winbuild @@ -47,7 +52,7 @@ win: _winbuild _build: $(SRCS) $(LIB_DEPS) Makefile setup.py touch src/pycantera.cpp /bin/rm -f _build - (CXX="@CXX@"; export CXX; CC="@CXX@"; export CC; PURIFY="@PURIFY@"; export PURIFY; @PYTHON_CMD@ setup.py build) + (CXX="@CXX@"; export CXX; CC="@CXX@"; export CC; CFLAGS="$(CXX_FLAGS)"; export CFLAGS; PURIFY="@PURIFY@"; export PURIFY; @PYTHON_CMD@ setup.py build) echo 'ok' > _build # @@ -86,7 +91,7 @@ endif clean: @PYTHON_CMD@ setup.py clean rm -f _build; rm -f _winbuild - cd build; rm -fR * + (cd build; rm -fR *) cd src; rm -f *.o depends: diff --git a/Cantera/python/examples/Makefile b/Cantera/python/examples/Makefile deleted file mode 100644 index 87dbe90c6..000000000 --- a/Cantera/python/examples/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -PY_DEMO_DIRS = equilibrium flames gasdynamics kinetics liquid_vapor \ - misc reactors surface_chemistry transport fuel_cells -MAKE = make -all: - @(for d in $(PY_DEMO_DIRS) ; do \ - echo "entering directory $${d}..."; \ - (cd $${d}; $(MAKE)) ; \ - done) - -run: - @(for d in $(PY_DEMO_DIRS) ; do \ - echo "entering directory $${d}..."; \ - (cd $${d}; $(MAKE) run) ; \ - done) - -test: - @(for d in $(PY_DEMO_DIRS) ; do \ - echo "entering directory $${d}..."; \ - (cd $${d}; $(MAKE) test) ; \ - done) - -install: - /usr/bin/install -c -d C:/cygwin/usr/local/cantera/demos/python - /usr/bin/install -c -c -m ug+rw,o+r Makefile C:/cygwin/usr/local/cantera/demos/python - /usr/bin/install -c -c -m ug+rw,o+r run_examples.py C:/cygwin/usr/local/cantera/demos/python - @(for d in $(PY_DEMO_DIRS) ; do \ - echo "entering directory $${d}..."; \ - (cd $${d}; $(MAKE) install) ; \ - done) - - -clean: - @(for dd in $(PY_DEMO_DIRS) ; do \ - echo "entering directory $${dd}..."; \ - (cd $${dd}; $(MAKE) -i clean; cd ..) ; \ - done) - -# end of file - -