diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.in b/test_problems/ChemEquil_gri_matrix/Makefile.in index b27f9dcff..9e64075a0 100644 --- a/test_problems/ChemEquil_gri_matrix/Makefile.in +++ b/test_problems/ChemEquil_gri_matrix/Makefile.in @@ -31,7 +31,11 @@ in_CanteraBuildTree = 1 os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.in b/test_problems/ChemEquil_gri_pairs/Makefile.in index 4d61ebe91..f3edb285e 100644 --- a/test_problems/ChemEquil_gri_pairs/Makefile.in +++ b/test_problems/ChemEquil_gri_pairs/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = gri_pairs # and from C/C++ separately OBJS = gri_pairs.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.in b/test_problems/ChemEquil_ionizedGas/Makefile.in index a9d0c59dc..6bbae1e66 100644 --- a/test_problems/ChemEquil_ionizedGas/Makefile.in +++ b/test_problems/ChemEquil_ionizedGas/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = ionizedGasEquil # and from C/C++ separately OBJS = ionizedGasEquil.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,7 +27,11 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # Executables extension EXE_EXT = @EXE_EXT@ @@ -43,11 +43,7 @@ CXX = @CXX@ # LOCAL_DEFS=-DDEBUG_CHEMEQUIL # # C++ compile flags -ifeq ($(src_dir_tree), 1) - CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ $(LOCAL_DEFS) -else - CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) -endif +CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ @@ -59,11 +55,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/ChemEquil_red1/Makefile.in b/test_problems/ChemEquil_red1/Makefile.in index 17a2a1681..78c656fd8 100644 --- a/test_problems/ChemEquil_red1/Makefile.in +++ b/test_problems/ChemEquil_red1/Makefile.in @@ -31,7 +31,11 @@ in_CanteraBuildTree = 1 os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ diff --git a/test_problems/CpJump/Makefile.in b/test_problems/CpJump/Makefile.in index 8a313cb7f..2eaf597fc 100644 --- a/test_problems/CpJump/Makefile.in +++ b/test_problems/CpJump/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = CpJump # and from C/C++ separately OBJS = CpJump.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -76,11 +72,7 @@ endif LIB_DEPS = $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS) $(CANTERA_CVODE_DEPS) # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/NASA9poly_test/Makefile.in b/test_problems/NASA9poly_test/Makefile.in index fcccf8bce..da793449f 100644 --- a/test_problems/NASA9poly_test/Makefile.in +++ b/test_problems/NASA9poly_test/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = NASA9poly_test # and from C/C++ separately OBJS = NASA9poly_test.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -70,11 +66,7 @@ CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \ endif # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/VCSnonideal/NaCl_equil/Makefile.in b/test_problems/VCSnonideal/NaCl_equil/Makefile.in index 5d5f5cf61..d6cd534d8 100644 --- a/test_problems/VCSnonideal/NaCl_equil/Makefile.in +++ b/test_problems/VCSnonideal/NaCl_equil/Makefile.in @@ -33,7 +33,11 @@ on_DEBUG_MODE=@CANTERA_DEBUG_MODE@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ diff --git a/test_problems/cathermo/DH_graph_1/Makefile.in b/test_problems/cathermo/DH_graph_1/Makefile.in index 95412c9b8..07e6dbf47 100644 --- a/test_problems/cathermo/DH_graph_1/Makefile.in +++ b/test_problems/cathermo/DH_graph_1/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = DH_graph_1 # 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 = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/DH_graph_NM/Makefile.in b/test_problems/cathermo/DH_graph_NM/Makefile.in index e81aa19e1..428d8db3f 100644 --- a/test_problems/cathermo/DH_graph_NM/Makefile.in +++ b/test_problems/cathermo/DH_graph_NM/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = DH_graph_1 # 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 = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/DH_graph_Pitzer/Makefile.in b/test_problems/cathermo/DH_graph_Pitzer/Makefile.in index 9db5977e0..da0256da9 100644 --- a/test_problems/cathermo/DH_graph_Pitzer/Makefile.in +++ b/test_problems/cathermo/DH_graph_Pitzer/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = DH_graph_1 # 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 = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.in b/test_problems/cathermo/DH_graph_acommon/Makefile.in index 9c5853182..ef0f292f4 100644 --- a/test_problems/cathermo/DH_graph_acommon/Makefile.in +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.in @@ -17,9 +17,6 @@ PROG_NAME = DH_graph_1 # 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 = 0 # additional flags to be passed to the linker. If your program # requires other external libraries, put them here @@ -31,17 +28,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +50,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/DH_graph_bdotak/Makefile.in b/test_problems/cathermo/DH_graph_bdotak/Makefile.in index 51876126f..88bea3f85 100644 --- a/test_problems/cathermo/DH_graph_bdotak/Makefile.in +++ b/test_problems/cathermo/DH_graph_bdotak/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = DH_graph_1 # 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 = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_dupl_test/Makefile.in b/test_problems/cathermo/HMW_dupl_test/Makefile.in index 91e67150b..3f2ae078d 100644 --- a/test_problems/cathermo/HMW_dupl_test/Makefile.in +++ b/test_problems/cathermo/HMW_dupl_test/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_dupl_test # and from C/C++ separately OBJS = HMW_dupl_test.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in index ba8f30194..7f522e6b5 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_graph_CpvT # and from C/C++ separately OBJS = HMW_graph_CpvT.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.in b/test_problems/cathermo/HMW_graph_GvI/Makefile.in index 8c5292fb0..52bb634c6 100644 --- a/test_problems/cathermo/HMW_graph_GvI/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_graph_GvI # and from C/C++ separately OBJS = HMW_graph_GvI.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.in b/test_problems/cathermo/HMW_graph_GvT/Makefile.in index 03624edf9..2576705e4 100644 --- a/test_problems/cathermo/HMW_graph_GvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_graph_GvT # and from C/C++ separately OBJS = HMW_graph_GvT.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in index 15743de36..5be910e02 100644 --- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_graph_HvT # and from C/C++ separately OBJS = HMW_graph_HvT.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in index d0ef115d0..fbaaf2390 100644 --- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_graph_VvT # and from C/C++ separately OBJS = HMW_graph_VvT.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp index 7cd555392..c6ca856e4 100644 --- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp +++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp @@ -7,13 +7,8 @@ #include -#ifdef SRCDIRTREE -#include "ct_defs.h" -#include "HMWSoln.h" -#else #include "Cantera.h" -#include "HMWSoln.h" -#endif +#include "kernel/HMWSoln.h" using namespace std; using namespace Cantera; diff --git a/test_problems/cathermo/HMW_test_1/Makefile.in b/test_problems/cathermo/HMW_test_1/Makefile.in index 8d0200092..d1d4a1d1a 100644 --- a/test_problems/cathermo/HMW_test_1/Makefile.in +++ b/test_problems/cathermo/HMW_test_1/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_test_1 # and from C/C++ separately OBJS = HMW_test_1.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,7 +27,11 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ @@ -45,11 +45,7 @@ endif # C++ compile flags -ifeq ($(src_dir_tree), 1) -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ $(DEBUG_FLAG) -else CXX_FLAGS = @CXXFLAGS@ $(DEBUG_FLAG) -endif # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ @@ -61,13 +57,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/HMW_test_3/Makefile.in b/test_problems/cathermo/HMW_test_3/Makefile.in index 90060dffa..33ac70878 100644 --- a/test_problems/cathermo/HMW_test_3/Makefile.in +++ b/test_problems/cathermo/HMW_test_3/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = HMW_test_3 # and from C/C++ separately OBJS = HMW_test_3.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,7 +27,11 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ @@ -44,11 +44,7 @@ DDD = endif # C++ compile flags -ifeq ($(src_dir_tree), 1) -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ $(DDD) -else CXX_FLAGS = @CXXFLAGS@ $(DDD) -endif # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ @@ -60,13 +56,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/ims/Makefile.in b/test_problems/cathermo/ims/Makefile.in index 195f088ea..2e94aa795 100644 --- a/test_problems/cathermo/ims/Makefile.in +++ b/test_problems/cathermo/ims/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = IMSTester # and from C/C++ separately OBJS = IMSTester.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in index 17edc06b1..3841e4e05 100644 --- a/test_problems/cathermo/issp/Makefile.in +++ b/test_problems/cathermo/issp/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = ISSPTester # and from C/C++ separately OBJS = ISSPTester.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/stoichSubSSTP/Makefile.in b/test_problems/cathermo/stoichSubSSTP/Makefile.in index 8f85117d2..8e0af910c 100644 --- a/test_problems/cathermo/stoichSubSSTP/Makefile.in +++ b/test_problems/cathermo/stoichSubSSTP/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = stoichSubSSTP # and from C/C++ separately OBJS = stoichSubSSTP.o sortAlgorithms.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/testIAPWS/Makefile.in b/test_problems/cathermo/testIAPWS/Makefile.in index 24bb2d435..aad9c8fd0 100755 --- a/test_problems/cathermo/testIAPWS/Makefile.in +++ b/test_problems/cathermo/testIAPWS/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testIAPWSphi # and from C/C++ separately OBJS = testIAPWSphi.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.in b/test_problems/cathermo/testIAPWSPres/Makefile.in index 457f74705..f2983bc19 100755 --- a/test_problems/cathermo/testIAPWSPres/Makefile.in +++ b/test_problems/cathermo/testIAPWSPres/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testPress # and from C/C++ separately OBJS = testPress.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.in b/test_problems/cathermo/testIAPWSTripP/Makefile.in index ccfa790c8..97b9f0dda 100755 --- a/test_problems/cathermo/testIAPWSTripP/Makefile.in +++ b/test_problems/cathermo/testIAPWSTripP/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testTripleP # and from C/C++ separately OBJS = testTripleP.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.in b/test_problems/cathermo/testWaterPDSS/Makefile.in index f2aab7312..21758fd7a 100755 --- a/test_problems/cathermo/testWaterPDSS/Makefile.in +++ b/test_problems/cathermo/testWaterPDSS/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testWaterPDSS # and from C/C++ separately OBJS = testWaterPDSS.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/cathermo/testWaterTP/Makefile.in b/test_problems/cathermo/testWaterTP/Makefile.in index b712cadc8..c58e63bb5 100644 --- a/test_problems/cathermo/testWaterTP/Makefile.in +++ b/test_problems/cathermo/testWaterTP/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testWaterSSTP # and from C/C++ separately OBJS = testWaterSSTP.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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@ diff --git a/test_problems/diamondSurf/Makefile.in b/test_problems/diamondSurf/Makefile.in index 27476d25b..2e782f307 100644 --- a/test_problems/diamondSurf/Makefile.in +++ b/test_problems/diamondSurf/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = runDiamond # and from C/C++ separately OBJS = runDiamond.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/diamondSurf_dupl/Makefile.in b/test_problems/diamondSurf_dupl/Makefile.in index a329db688..c8568e9cf 100644 --- a/test_problems/diamondSurf_dupl/Makefile.in +++ b/test_problems/diamondSurf_dupl/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = runDiamondDupl # and from C/C++ separately OBJS = runDiamondDupl.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/fracCoeff/Makefile.in b/test_problems/fracCoeff/Makefile.in index ffe9cd7d1..c232af0f6 100644 --- a/test_problems/fracCoeff/Makefile.in +++ b/test_problems/fracCoeff/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = fracCoeff # and from C/C++ separately OBJS = fracCoeff.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/min_python/minDiamond/Makefile.in b/test_problems/min_python/minDiamond/Makefile.in index f598475b8..da36447fe 100644 --- a/test_problems/min_python/minDiamond/Makefile.in +++ b/test_problems/min_python/minDiamond/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = runDiamond # and from C/C++ separately OBJS = runDiamond.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/min_python/negATest/Makefile.in b/test_problems/min_python/negATest/Makefile.in index a43bce704..372f8ccc9 100644 --- a/test_problems/min_python/negATest/Makefile.in +++ b/test_problems/min_python/negATest/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = negATest # and from C/C++ separately OBJS = negATest.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/mixGasTransport/Makefile.in b/test_problems/mixGasTransport/Makefile.in index e953d9b05..5c3667a9b 100644 --- a/test_problems/mixGasTransport/Makefile.in +++ b/test_problems/mixGasTransport/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = mixGasTransport # and from C/C++ separately OBJS = mixGasTransport.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/multiGasTransport/Makefile.in b/test_problems/multiGasTransport/Makefile.in index 5ebdf61cb..3237c2f4b 100644 --- a/test_problems/multiGasTransport/Makefile.in +++ b/test_problems/multiGasTransport/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = multiGasTransport # and from C/C++ separately OBJS = multiGasTransport.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -70,11 +66,7 @@ CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \ endif # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/negATest/Makefile.in b/test_problems/negATest/Makefile.in index fa67f8003..9aa7a29a4 100644 --- a/test_problems/negATest/Makefile.in +++ b/test_problems/negATest/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = negATest # and from C/C++ separately OBJS = negATest.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/pureFluidTest/Makefile.in b/test_problems/pureFluidTest/Makefile.in index 7e58be34b..5191bfb1f 100644 --- a/test_problems/pureFluidTest/Makefile.in +++ b/test_problems/pureFluidTest/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = testPureWater # and from C/C++ separately OBJS = testPureWater.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,13 +49,8 @@ CANTERA_LIBDIR=@buildlib@ 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 @CXX_INCLUDES@ -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/rankine_democxx/Makefile.in b/test_problems/rankine_democxx/Makefile.in index 87c6165c7..5cbda8ec3 100644 --- a/test_problems/rankine_democxx/Makefile.in +++ b/test_problems/rankine_democxx/Makefile.in @@ -30,7 +30,11 @@ in_CanteraBuildTree = 1 os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ diff --git a/test_problems/silane_equil/Makefile.in b/test_problems/silane_equil/Makefile.in index 7f69ec1e3..56662bfa4 100644 --- a/test_problems/silane_equil/Makefile.in +++ b/test_problems/silane_equil/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = silane_equil # and from C/C++ separately OBJS = silane_equil.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -53,11 +49,7 @@ CANTERA_LIBDIR=@buildlib@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/spectroscopy/Makefile.in b/test_problems/spectroscopy/Makefile.in index d369747de..9a2cfaa93 100644 --- a/test_problems/spectroscopy/Makefile.in +++ b/test_problems/spectroscopy/Makefile.in @@ -15,10 +15,6 @@ PROG_NAME = spectratest # and from C/C++ separately OBJS = spectratest.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -29,17 +25,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries -FORT_LIBS = #@FLIBS@ +ifeq (@build_with_f2c@, 0) +FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ # C++ compile flags -ifeq ($(src_dir_tree), 1) -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ -else CXX_FLAGS = @CXXFLAGS@ -endif # external libraries EXT_LIBS = @LOCAL_LIBS@ -lctcxx @@ -61,11 +57,7 @@ CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/libtransport.a \ $(CANTERA_LIBDIR)/libctbase.a # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/surfSolverTest/Makefile.in b/test_problems/surfSolverTest/Makefile.in index 2e0236f7f..d54d1140d 100644 --- a/test_problems/surfSolverTest/Makefile.in +++ b/test_problems/surfSolverTest/Makefile.in @@ -17,10 +17,6 @@ PROG_NAME = surfaceSolver # and from C/C++ separately OBJS = surfaceSolver.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -31,17 +27,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # 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@ @@ -62,11 +58,7 @@ CANTERA_LIB_DEP=$(CANTERA_LIBDIR)/libctbase.a \ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ diff --git a/test_problems/surfkin/Makefile.in b/test_problems/surfkin/Makefile.in index 2daf70ed0..c4b27651b 100644 --- a/test_problems/surfkin/Makefile.in +++ b/test_problems/surfkin/Makefile.in @@ -15,10 +15,6 @@ PROG_NAME = surfdemo # and from C/C++ separately OBJS = surfdemo.o -# Location of the current build. Will assume that tests are run -# in the source directory tree location -src_dir_tree = 0 - # additional flags to be passed to the linker. If your program # requires other external libraries, put them here LINK_OPTIONS = @EXTRA_LINK@ @@ -29,17 +25,17 @@ LINK_OPTIONS = @EXTRA_LINK@ os_is_win = @OS_IS_WIN@ # Fortran libraries +ifeq (@build_with_f2c@, 0) FORT_LIBS = @FLIBS@ +else +FORT_LIBS = +endif # the C++ compiler CXX = @CXX@ # C++ compile flags -ifeq ($(src_dir_tree), 1) -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ -else CXX_FLAGS = @CXXFLAGS@ -endif # external libraries EXT_LIBS = @LOCAL_LIBS@ -lctcxx @@ -56,11 +52,7 @@ CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ # the directory where Cantera include files may be found. -ifeq ($(src_dir_tree), 1) -CANTERA_INCDIR=../../Cantera/src -else CANTERA_INCDIR=@ctroot@/build/include/cantera -endif # flags passed to the C++ compiler/linker for the linking step LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@