From 9db51aae38e1bbb965d3b524f413390d52262098 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Tue, 17 Mar 2015 03:15:22 +0000
Subject: [PATCH] working fortran 2003 builds

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9369 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 src/Makefile.am   | 13 ++++++++-----
 tests/Makefile.am | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b1cb5a1..10491c43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,8 @@ libiphreeqc_la_SOURCES=\
 	Debug.h\
 	ErrorReporter.hxx\
 	IPhreeqc.cpp\
+	IPhreeqc_interface_F.cpp\
+	IPhreeqc_interface_F.h\
 	IPhreeqcLib.cpp\
 	phreeqcpp/advection.cpp\
 	phreeqcpp/basicsubs.cpp\
@@ -178,11 +180,12 @@ if BUILD_FORTRAN
 
 libiphreeqc_la_SOURCES+=\
 	fwrap.h\
-	fwrap.cpp\
-	IPhreeqcF.f
+	fwrap.cpp
+##	fwrap.cpp\
+##	IPhreeqcF.f
 
-include_HEADERS+=\
-	$(top_srcdir)/src/IPhreeqc.f90.inc\
-	$(top_srcdir)/src/IPhreeqc.f.inc
+##include_HEADERS+=\
+##	$(top_srcdir)/src/IPhreeqc.f90.inc\
+##	$(top_srcdir)/src/IPhreeqc.f.inc
 
 endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 738dea30..3646de39 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,12 +15,17 @@ test_cxx_SOURCES = test_cxx.cxx
 test_cxx_LDADD = $(top_builddir)/src/libiphreeqc.la
 
 if BUILD_FORTRAN
-TESTS += test_f test_f90
-check_PROGRAMS += test_f test_f90
+##TESTS += 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_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
+##test_f_SOURCES = test_f.f main_fortran.cxx
+##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.o : test_f90.f90 ../src/IPhreeqc_interface.o
+
 endif