From 38a71d835049e2eeffb4513d29e18b76e73e0f54 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Tue, 26 May 2015 07:48:17 +0000
Subject: [PATCH] bug fix for dist

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 843e0e40..bbf23584 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -189,7 +189,8 @@ SRC=\
 
 if FORTRAN_MODULE
 
-SRC += $(top_srcdir)/src/IPhreeqc_interface.F90
+SRC+=\
+	$(top_srcdir)/src/IPhreeqc_interface.F90
 
 else
 
@@ -201,4 +202,5 @@ libiphreeqc_la_SOURCES+=\
 	fwrap.h\
 	fwrap.cpp\
 	IPhreeqcF.f
+
 endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d5916b2c..d5eddef2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,28 +20,23 @@ CLEANFILES =\
 	phreeqc.0.err
 
 if BUILD_FORTRAN
-##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_f90_SOURCES = test_f90.F90 main_fortran.cxx IPhreeqc_interface.F90
+test_f90_SOURCES = test_f90.F90 main_fortran.cxx
 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
 .PHONY: clean-modules
 clean-modules:
 	-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