GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Dave Goodwin 2003-04-20 04:04:16 +00:00
parent ce48c77bd9
commit 6ea7a847ab
19 changed files with 428 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cantera/clib/src/Makefile.in
View File

@ -31,7 +31,8 @@ CXX = @CXX@
EXT_LIBS = -lzeroD -loneD @LOCAL_LIBS@
# the directory where the Cantera libraries are located
CANTERA_LIBDIR=../../../lib
CANTERA_LIBDIR=@buildlib@
# ../../../lib
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
@ -50,20 +51,18 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @CXXFLAGS@
LIB_NAME=lib@CT_SHARED_LIB@
ifeq ($(shared_ctlib),1)
CTLIB = ./$(LIB_NAME)@SO@
CTLIB = @buildlib@/$(LIB_NAME)@SO@
else
CTLIB = ./$(LIB_NAME).a
CTLIB = @buildlib@/$(LIB_NAME).a
endif
lib: $(OBJS) $(LIB_DEPS)
$(RM) $(CTLIB)
ifeq ($(shared_ctlib),1)
$(CXX) -o $(CTLIB) $(OBJS) $(LCXX_FLAGS) @SHARED@ $(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ $(FORT_LIBS)
cp $(CTLIB) ../../../lib
else
@ARCHIVE@ $(CTLIB) $(OBJS)
cp $(CTLIB) ../../../lib
ranlib ../../../lib/$(CTLIB)
ranlib $(CTLIB)
endif
clean:

10
Cantera/matlab/Makefile.in
View File

@ -21,10 +21,14 @@ SRCS = cantera/private/ctmethods.cpp \
cantera/private/wallmethods.cpp \
cantera/private/flowdevicemethods.cpp
all: ctmethods.mexmac
CANTERA_LIBDIR=../../lib
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
ctmethods.mexmac: $(SRCS)
@PYTHON_CMD@ setup_matlab.py @ctroot@/lib @CT_SHARED_LIB@ '$(LIBS)'
all: cantera/ctmethods.@mex_ext@
cantera/ctmethods.@mex_ext@: $(SRCS) $(LIB_DEPS)
@PYTHON_CMD@ setup_matlab.py @ctroot@/build/lib @CT_SHARED_LIB@ '$(LIBS)'
(@MATLAB_CMD@ -nodesktop -nojvm -nosplash -r setup)
rm -f setup.m

24
Cantera/python/Makefile.in
View File

@ -9,11 +9,29 @@
#
###############################################################
all: refresh
@PYTHON_CMD@ setup.py build
CANTERA_LIBDIR=../../lib
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
SRCS = src/ctphase_methods.cpp \
src/ctthermo_methods.cpp \
src/ctkinetics_methods.cpp \
src/cttransport_methods.cpp \
src/ctxml_methods.cpp \
src/ctflow_methods.cpp \
src/ctfuncs.cpp \
src/ctsurf_methods.cpp \
src/ctbndry_methods.cpp \
src/ctrpath_methods.cpp \
src/ctreactor_methods.cpp \
src/ctfunc_methods.cpp \
src/methods.h
refresh: $(LIB_DEPS)
all: _build
_build: $(SRCS) $(LIB_DEPS)
touch src/pycantera.cpp
@PYTHON_CMD@ setup.py build
echo 'ok' > _build
install:
@PYTHON_CMD@ setup.py install

4
Cantera/python/setup.py
View File

@ -33,9 +33,9 @@ setup(name="Cantera",
ext_modules=[
Extension("Cantera._cantera",
["src/pycantera.cpp"],
include_dirs=["../../include",
include_dirs=["../../build/include",
"src", "../clib/src"],
library_dirs = ["../../lib"], libraries = libs)
library_dirs = ["../../build/lib"], libraries = libs)
],
)

2
Cantera/src/Makefile.in
View File

@ -86,7 +86,7 @@ flow1D:
CXX_LIBS = @LIBS@
CXX_INCLUDES = -I.
CANTERA_LIB = ./libcantera.a
CANTERA_LIB = @buildlib@/libcantera.a
DEPENDS = $(EVERYTHING:.o=.d)

2
Cantera/src/converters/Makefile.in
View File

@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
OBJS = ck2ctml.o atomicWeightDB.o CKParser.o CKReader.o Reaction.o ckr_utils.o thermoFunctions.o writelog.o
CXX_INCLUDES = -I. -I..
CONV_LIB = ./libconverters.a
CONV_LIB = @buildlib@/libconverters.a
DEPENDS = $(OBJS:.o=.d)

2
Cantera/src/oneD/Makefile.in
View File

@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
OBJS = MultiJac.o MultiNewton.o newton_utils.o OneDim.o StFlow.o
CXX_INCLUDES = -I..
ONED_LIB = ./liboneD.a
ONED_LIB = @buildlib@/liboneD.a
DEPENDS = $(OBJS:.o=.d)

2
Cantera/src/transport/Makefile.in
View File

@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
OBJS = TransportFactory.o MultiTransport.o MixTransport.o MMCollisionInt.o
CXX_INCLUDES = -I..
LIB = ./libtransport.a
LIB = @buildlib@/libtransport.a
DEPENDS = $(OBJS:.o=.d)

2
Cantera/src/zeroD/Makefile.in
View File

@ -19,7 +19,7 @@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
OBJS = Reactor.o ReactorBase.o FlowDevice.o Wall.o
CXX_INCLUDES = -I..
ZEROD_LIB = ./libzeroD.a
ZEROD_LIB = @buildlib@/libzeroD.a
DEPENDS = $(OBJS:.o=.d)

16
Makefile.in
View File

@ -17,37 +17,33 @@ build_matlab = @BUILD_MATLAB@
LIBDIR=@LIB_DIR@
# removed utils temporarily
all: kernel movelibs hdr-collect clib python matlab utils
all: kernel hdr-collect clib python matlab utils
install: hdr-install kernel-install data-install python-install matlab-install tools-install finish-install
demos: example_codes
kernel: info
rm -f lib/*.a
rm -f lib/*.so
@INSTALL@ -d @buildlib@
rm -f @buildlib@/*.a
rm -f @buildlib@/*.so
cd ext; @MAKE@
cd Cantera/src; @MAKE@
clib:
cd Cantera/clib/src; @MAKE@
ranlib @buildlib@/*.a
cxxlib:
cd Cantera/cxx; make
movelibs:
mv -f Cantera/src/*.a lib
mv -f Cantera/src/*/*.a lib
mv -f ext/*/*.a lib
ranlib lib/*.a
utils:
cd tools; @MAKE@
kernel-install:
@INSTALL@ -d @prefix@/lib/cantera
rm -f @prefix@/lib/cantera/*
@INSTALL@ -m 644 lib/*.a @prefix@/lib/cantera
@INSTALL@ -m 644 build/lib/*.a @prefix@/lib/cantera
cd Cantera/clib/src; make install
ranlib @prefix@/lib/cantera/*.a

617
config/configure vendored
View File

File diff suppressed because it is too large Load Diff

18
config/configure.in
View File

@ -28,6 +28,9 @@ AC_SUBST(ctroot)
AC_CANONICAL_SYSTEM()
buildlib=$ctroot/build/lib
AC_SUBST(buildlib)
#case "$target" in
#mips-sgi-irix*.*)
# if test -z "$CXX"; then CXX=CC; fi
@ -239,18 +242,25 @@ AC_SUBST(BUILD_F90)
# Python Interface
#
BUILD_PYTHON=0
if test "$BUILD_PYTHON_INTERFACE" = "y"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
if test -z "$PYTHON_CMD"; then
AC_PATH_PROGS(PYTHON_CMD, python2 python, "none")
if test "$PYTHON_CMD" != "none"; then BUILD_PYTHON=1; BUILD_CLIB=1; fi
fi
AC_SUBST(BUILD_PYTHON)
AC_SUBST(PYTHON_CMD)
#AC_SUBST(PYTHON_CMD)
#
# Matlab Interface
#
BUILD_MATLAB=0
if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
if test -z "$MATLAB_CMD"; then
AC_PATH_PROG(MATLAB_CMD, matlab, "none")
if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
fi
#if test "$BUILD_MATLAB_TOOLBOX" = "y"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
AC_SUBST(BUILD_MATLAB)
AC_SUBST(MATLAB_CMD)
# AC_SUBST(MATLAB_CMD)
AC_SUBST(BUILD_CLIB)

8
configure vendored
View File

@ -50,8 +50,8 @@ BUILD_FORTRAN_90_INTERFACE='n' # Fortran is temporarily not working
# to the path to the Python interpreter to use, if there is more than
# one on your system.
BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"}
PYTHON_CMD=${PYTHON_CMD:=python}
#BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"}
#PYTHON_CMD=${PYTHON_CMD:=python}
#----------- Matlab --------------------------------------------------
@ -60,8 +60,8 @@ PYTHON_CMD=${PYTHON_CMD:=python}
# be installed on your system first, since the build process runs a
# Matlab script.
BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
MATLAB_CMD=${MATLAB_CMD:=matlab}
# BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
# MATLAB_CMD=${MATLAB_CMD:=matlab}

2
ext/blas/Makefile.in
View File

@ -2,7 +2,7 @@
#
#/bin/sh
BLASLIB = ./libctblas.a
BLASLIB = @buildlib@/libctblas.a
SUFFIXES=
SUFFIXES= .f .o

8
ext/cvode/Makefile.in
View File

@ -22,7 +22,7 @@
# If the ranlib utility is not available on your system, then remove the call
# to ranlib from the commands to create libcvode.a.
all: ./libcvode.a
all: @buildlib@/libcvode.a
COMPILER = @CC@
@ -33,9 +33,9 @@ OBJS = source/cvode.o source/cvdense.o source/dense.o source/cvband.o \
source/iterativ.o source/cvbandpre.o source/nvector.o source/llnlmath.o
./libcvode.a: $(OBJS)
$(RM) ./libcvode.a
(ar rcv ./libcvode.a $(OBJS); ranlib ./libcvode.a)
@buildlib@/libcvode.a: $(OBJS)
$(RM) @buildlib@/libcvode.a
(ar rcv @buildlib@/libcvode.a $(OBJS); ranlib @buildlib@/libcvode.a)
source/cvode.o: source/cvode.c include/cvode.h include/llnltyps.h \
include/nvector.h include/llnlmath.h

2
ext/lapack/Makefile.in
View File

@ -2,7 +2,7 @@
#
#/bin/sh
LAPACKLIB = ./libctlapack.a
LAPACKLIB = @buildlib@/libctlapack.a
SUFFIXES=
SUFFIXES= .f .o

2
ext/math/Makefile.in
View File

@ -5,7 +5,7 @@
# $Date$
#
LIB = ./libctmath.a
LIB = @buildlib@/libctmath.a
SUFFIXES=
SUFFIXES= .f .d .o

2
ext/recipes/Makefile.in
View File

@ -2,7 +2,7 @@
#
#/bin/sh
LIB = ./librecipes.a
LIB = @buildlib@/librecipes.a
SUFFIXES=
SUFFIXES= .f .d .o

2
ext/tpx/Makefile.in
View File

@ -13,7 +13,7 @@ FOBJS =
CXX_LIBS = @LIBS@
CXX_INCLUDES = -I../include
TPLIB = ./libtpx.a
TPLIB = @buildlib@/libtpx.a
DEPENDS = $(COBJS:.o=.d)