max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

working fortran 2003 builds

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9369 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-03-17 03:15:22 +00:00
parent 28f75ed56c
commit 9db51aae38
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile.am
View File

@ -33,6 +33,8 @@ libiphreeqc_la_SOURCES=\
Debug.h\ Debug.h\
ErrorReporter.hxx\ ErrorReporter.hxx\
IPhreeqc.cpp\ IPhreeqc.cpp\
IPhreeqc_interface_F.cpp\
IPhreeqc_interface_F.h\
IPhreeqcLib.cpp\ IPhreeqcLib.cpp\
phreeqcpp/advection.cpp\ phreeqcpp/advection.cpp\
phreeqcpp/basicsubs.cpp\ phreeqcpp/basicsubs.cpp\
@ -178,11 +180,12 @@ if BUILD_FORTRAN
libiphreeqc_la_SOURCES+=\ libiphreeqc_la_SOURCES+=\
fwrap.h\ fwrap.h\
fwrap.cpp\ fwrap.cpp
IPhreeqcF.f ## fwrap.cpp\
## IPhreeqcF.f
include_HEADERS+=\ ##include_HEADERS+=\
$(top_srcdir)/src/IPhreeqc.f90.inc\ ## $(top_srcdir)/src/IPhreeqc.f90.inc\
$(top_srcdir)/src/IPhreeqc.f.inc ## $(top_srcdir)/src/IPhreeqc.f.inc
endif endif

15
tests/Makefile.am
View File

@ -15,12 +15,17 @@ test_cxx_SOURCES = test_cxx.cxx
test_cxx_LDADD = $(top_builddir)/src/libiphreeqc.la test_cxx_LDADD = $(top_builddir)/src/libiphreeqc.la
if BUILD_FORTRAN if BUILD_FORTRAN
TESTS += test_f test_f90 ##TESTS += test_f test_f90
check_PROGRAMS += test_f test_f90 ##check_PROGRAMS += test_f test_f90
TESTS += test_f90
check_PROGRAMS += test_f90
test_f_SOURCES = test_f.f main_fortran.cxx ##test_f_SOURCES = test_f.f main_fortran.cxx
test_f_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS) ##test_f_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
test_f90_SOURCES = test_f90.f90 main_fortran.cxx test_f90_SOURCES = test_f90.f90 main_fortran.cxx $(top_srcdir)/src/IPhreeqc_interface.F90
test_f90_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS) test_f90_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
test_f90.o : test_f90.f90 ../src/IPhreeqc_interface.o
endif endif