Started fixing the fortran interface
This commit is contained in:
parent
fe4352799e
commit
7950b10bb2
6 changed files with 5690 additions and 3774 deletions
9438
configure
vendored
9438
configure
vendored
File diff suppressed because one or more lines are too long
11
configure.in
11
configure.in
|
|
@ -1521,6 +1521,16 @@ override_f77_libs=0;
|
|||
|
||||
#fi
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# LCXX_FLIBS are extra libraries the CXX linker needs
|
||||
# in order to link in fortran programs where fortran is the main program
|
||||
|
||||
LCXX_FLIBS=
|
||||
|
||||
case $ac_sys_system in
|
||||
SunOS*) LCXX_FLIBS="-lCrun -lCstd -lfsu" ;;
|
||||
esac
|
||||
|
||||
#--------------------------------------------
|
||||
|
||||
|
||||
|
|
@ -1617,6 +1627,7 @@ AC_SUBST(F90)
|
|||
AC_SUBST(F90FLAGS)
|
||||
AC_SUBST(F90BUILDFLAGS)
|
||||
AC_SUBST(F90LIBS)
|
||||
AC_SUBST(LCXX_FLIBS)
|
||||
|
||||
AC_OBJEXT
|
||||
AC_EXEEXT
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ export MAKE
|
|||
|
||||
#
|
||||
# Pointers to the 64 bit python built with Sunpro compilers
|
||||
#
|
||||
PYTHON_DIR=/home/hkmoffa/arch/sol_py64
|
||||
export PYTHON_DIR
|
||||
PYTHON_CMD=/home/hkmoffa/arch/sol_py64/bin/python
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys, os, string
|
||||
prefix = '@prefix@'
|
||||
prefix = '@python_prefix@'
|
||||
pycmd = '@PYTHON_CMD@' # sys.argv[2]
|
||||
localinst = @local_inst@
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,9 @@ FORT = @F77@
|
|||
# Fortran compile flags
|
||||
FORT_FLAGS = @FFLAGS@
|
||||
|
||||
# Fortran libraries
|
||||
FORT_LIBS = @FLIBS@
|
||||
# Fortran libraries used to link fortran main programs
|
||||
# using the CXX linker
|
||||
FORT_LIBS = @LCXX_FLIBS@ @FLIBS@
|
||||
|
||||
# the C++ compiler
|
||||
CXX = @CXX@
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ EXT_LIBS = -lfct -lclib @LOCAL_LIBS@ -lctcxx -lstdc++ @F90LIBS@
|
|||
# the Fortran 90/95 compiler
|
||||
F90 = @F90@
|
||||
|
||||
# Fortran libraries used to link fortran main programs
|
||||
# using the CXX linker
|
||||
FLIBS=@LCXX_FLIBS@ @FLIBS@
|
||||
|
||||
# Fortran compile flags
|
||||
FORT_FLAGS = @F90FLAGS@
|
||||
|
||||
|
|
@ -68,7 +72,8 @@ DEPENDS = $(OBJS:.o=.d)
|
|||
all: $(PROGRAM)
|
||||
|
||||
$(PROGRAM): $(OBJS)
|
||||
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXXFLAGS) $(CANTERA_LIBS) $(LINK_OPTIONS) $(EXT_LIBS) @FLIBS@ @LIBS@
|
||||
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXXFLAGS) $(CANTERA_LIBS) $(LINK_OPTIONS) \
|
||||
$(EXT_LIBS) $(FLIBS) @LIBS@
|
||||
|
||||
%.d : %.cpp
|
||||
g++ -MM -I$(CANTERA_INCDIR) $*.cpp > $*.d
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue