Fixed an error in IdealMolalSoln -> density wasn't beeing recalculated.
Updated the test problem with the fix.
Worked CANTERA_DEBUG_MODE into the Makefiles. It wasn't being used.
Split the multiproblem DH_graph_1 test into multiple directories, one per test
Worked on getting all of the test problems to have the same look, feel, and printout.
112 lines
2.8 KiB
Makefile
112 lines
2.8 KiB
Makefile
#!/bin/sh
|
|
|
|
############################################################################
|
|
#
|
|
# Makefile to compile and link a C++ application to
|
|
# Cantera.
|
|
#
|
|
#############################################################################
|
|
|
|
# addition to suffixes
|
|
.SUFFIXES : .d
|
|
|
|
# the name of the executable program to be created
|
|
PROG_NAME = DH_graph_1
|
|
|
|
# the object files to be linked together. List those generated from Fortran
|
|
# and from C/C++ separately
|
|
OBJS = DH_graph_1.o
|
|
|
|
# Location of the current build. Will assume that tests are run
|
|
# in the source directory tree location
|
|
src_dir_tree = 1
|
|
|
|
# additional flags to be passed to the linker. If your program
|
|
# requires other external libraries, put them here
|
|
LINK_OPTIONS = @EXTRA_LINK@
|
|
|
|
#############################################################################
|
|
|
|
# Check to see whether we are in the msvc++ environment
|
|
os_is_win = @OS_IS_WIN@
|
|
|
|
# Fortran libraries
|
|
FORT_LIBS = @FLIBS@
|
|
|
|
# the C++ compiler
|
|
CXX = @CXX@
|
|
|
|
# C++ compile flags
|
|
ifeq ($(src_dir_tree), 1)
|
|
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@
|
|
else
|
|
CXX_FLAGS = @CXXFLAGS@
|
|
endif
|
|
|
|
# Ending C++ linking libraries
|
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
|
|
|
# the directory where the Cantera libraries are located
|
|
CANTERA_LIBDIR=@buildlib@
|
|
|
|
# required Cantera libraries
|
|
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
|
|
|
|
# the directory where Cantera include files may be found.
|
|
ifeq ($(src_dir_tree), 1)
|
|
CANTERA_INCDIR=../../../Cantera/src
|
|
INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/thermo
|
|
else
|
|
CANTERA_INCDIR=@ctroot@/build/include/cantera
|
|
INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
|
|
endif
|
|
|
|
# flags passed to the C++ compiler/linker for the linking step
|
|
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
|
|
|
|
# How to compile C++ source files to object files
|
|
.@CXX_EXT@.@OBJ_EXT@:
|
|
$(CXX) -c $< $(INCLUDES) $(CXX_FLAGS)
|
|
|
|
# How to compile the dependency file
|
|
.cpp.d:
|
|
@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
|
|
|
|
# List of dependency files to be created
|
|
DEPENDS=$(OBJS:.o=.d)
|
|
|
|
# Program Name
|
|
PROGRAM = $(PROG_NAME)$(EXE_EXT)
|
|
|
|
all: $(PROGRAM) .depends
|
|
|
|
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \
|
|
$(CANTERA_LIBDIR)/libcaThermo.a .depends
|
|
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
|
|
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
|
|
$(LCXX_END_LIBS)
|
|
|
|
# depends target -> forces recalculation of dependencies
|
|
depends:
|
|
@MAKE@ .depends
|
|
|
|
.depends: $(DEPENDS)
|
|
cat $(DEPENDS) > .depends
|
|
|
|
# Do the test -> For the windows vc++ environment, we have to skip checking on
|
|
# whether the program is uptodate, because we don't utilize make
|
|
# in that environment to build programs.
|
|
test:
|
|
ifeq ($(os_is_win), 1)
|
|
else
|
|
@ @MAKE@ -s $(PROGRAM)
|
|
endif
|
|
@ ./runtest
|
|
|
|
clean:
|
|
$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends
|
|
../../../bin/rm_cvsignore
|
|
(if test -d SunWS_cache ; then \
|
|
$(RM) -rf SunWS_cache ; \
|
|
fi )
|
|
|