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

bug fix for dist

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9723 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-05-26 07:48:17 +00:00
parent a4495e79c6
commit 38a71d8350
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -189,7 +189,8 @@ SRC=\
if FORTRAN_MODULE if FORTRAN_MODULE
SRC += $(top_srcdir)/src/IPhreeqc_interface.F90 SRC+=\
$(top_srcdir)/src/IPhreeqc_interface.F90
else else
@ -201,4 +202,5 @@ libiphreeqc_la_SOURCES+=\
fwrap.h\ fwrap.h\
fwrap.cpp\ fwrap.cpp\
IPhreeqcF.f IPhreeqcF.f
endif endif

23
tests/Makefile.am
View File

@ -20,28 +20,23 @@ CLEANFILES =\
phreeqc.0.err phreeqc.0.err
if BUILD_FORTRAN if BUILD_FORTRAN
##TESTS += test_f test_f90
##check_PROGRAMS += test_f test_f90
TESTS += test_f90 TESTS += test_f90
check_PROGRAMS += test_f90 check_PROGRAMS += test_f90
##test_f_SOURCES = test_f.f main_fortran.cxx test_f90_SOURCES = test_f90.F90 main_fortran.cxx
##test_f_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
test_f90_SOURCES = test_f90.F90 main_fortran.cxx IPhreeqc_interface.F90
test_f90_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS) test_f90_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
if FORTRAN_MODULE
test_f90_SOURCES += $(top_srcdir)/src/IPhreeqc_interface.F90
test_f90.$(OBJEXT) : test_f90.F90 IPhreeqc_interface.$(OBJEXT)
IPhreeqc_interface.$(OBJEXT) : $(top_srcdir)/src/IPhreeqc_interface.F90
endif
mostlyclean-local: clean-modules mostlyclean-local: clean-modules
.PHONY: clean-modules .PHONY: clean-modules
clean-modules: clean-modules:
-test -z $(FC_MODEXT) || $(RM) *.$(FC_MODEXT) -test -z $(FC_MODEXT) || $(RM) *.$(FC_MODEXT)
test_f90.$(OBJEXT) : test_f90.F90 IPhreeqc_interface.$(OBJEXT)
IPhreeqc_interface.$(OBJEXT) : $(srcdir)/IPhreeqc_interface.F90
$(srcdir)/IPhreeqc_interface.F90:
cd $(srcdir) && $(LN_S) ../src/IPhreeqc_interface.F90 .
endif endif