diff --git a/platform/posix/Cantera.mak.in b/platform/posix/Cantera.mak.in index ec2d08246..4009ea2f1 100644 --- a/platform/posix/Cantera.mak.in +++ b/platform/posix/Cantera.mak.in @@ -28,11 +28,11 @@ CANTERA_VERSION=@cantera_version@ CANTERA_CORE_INCLUDES=-I@ct_incroot@ # Required Cantera libraries -CANTERA_CORE_LIBS=@mak_threadflags@ -L@ct_libdir@ -lcantera -lctmath -lexecstream +CANTERA_CORE_LIBS=@mak_threadflags@ -L@ct_libdir@ @mak_corelibs@ CANTERA_CORE_LIBS_DEP = @ct_libdir@/libcantera.a -CANTERA_CORE_FTN=-L@ct_libdir@ -lcantera_fortran -lcantera +CANTERA_CORE_FTN=-L@ct_libdir@ -lcantera_fortran @mak_corelibs@ CANTERA_FORTRAN_MODS=@ct_incroot@/cantera @@ -65,17 +65,10 @@ CANTERA_BLAS_LAPACK_LIBS=@mak_blas_lapack_libs@ endif ############################################################################### -# F2C USAGE +# F2C USAGE ############################################################################### -CANTERA_mak_have_f2c_lib=@mak_have_f2c_lib@ - -ifeq ($(CANTERA_mak_have_f2c_lib), 1) - CANTERA_F2C_LIBS= -lctf2c -else - CANTERA_F2C_LIBS= -endif - +CANTERA_F2C_LIBS= @mak_f2c_lib@ ############################################################################### # COMBINATIONS OF INCLUDES AND LIBS @@ -101,8 +94,8 @@ CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \ CANTERA_FORTRAN_LIBS=$(CANTERA_CORE_FTN) $(CANTERA_SUNDIALS_LIBS) \ - $(CANTERA_BLAS_LAPACK_LIBS) $(CANTERA_BOOST_LIBS) \ - $(CANTERA_FORTRAN_SYSLIBS) + $(CANTERA_BLAS_LAPACK_LIBS) $(CANTERA_F2C_LIBS) \ + $(CANTERA_BOOST_LIBS) $(CANTERA_FORTRAN_SYSLIBS) ############################################################################### # END diff --git a/platform/posix/SConscript b/platform/posix/SConscript index 15dcde718..740884dc1 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -29,6 +29,10 @@ pc_libdirs = [] pc_incdirs = [] pc_cflags = [] +localenv['mak_corelibs'] = '-lcantera' +if not env['single_library']: + localenv['mak_corelibs'] += ' -lctmath -lexecstream' + if env['use_sundials'] == 'n': localenv['mak_sundials_libs'] = '-lcvode' localenv['mak_sundials_libdir'] = '' @@ -71,8 +75,10 @@ localenv['mak_have_blas_lapack_dir'] = '1' if localenv['blas_lapack_dir'] else ' if localenv['blas_lapack_dir']: localenv['mak_blas_lapack_libs'] = ' '.join('-l%s' % s for s in localenv['blas_lapack_libs']) pc_libs += localenv['blas_lapack_libs'] -else: +elif not env['single_library']: localenv['mak_blas_lapack_libs'] = ('-L' + '$inst_libdir' + ' -lctlapack -lctblas') +else: + localenv['mak_blas_lapack_libs'] = '' localenv['mak_threadflags'] = localenv['thread_flags'] if '-pthread' in localenv['thread_flags']: @@ -83,7 +89,7 @@ else: localenv['mak_fort_threadflags'] = '' # Handle f2c Linkage -localenv['mak_have_f2c_lib'] = '1' if localenv['build_with_f2c'] else '0' +localenv['mak_f2c_lib'] = '-lctf2c' if localenv['build_with_f2c'] and not env['single_library'] else '' mak = build(localenv.SubstFile('Cantera.mak', 'Cantera.mak.in')) install('$inst_incdir', mak)