From ab2a305be8ba4ffca1042946e05ad63062e661fc Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Sat, 3 Apr 2010 03:55:24 +0000
Subject: [PATCH] updated for linux

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4208 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 unit/GNUmakefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/unit/GNUmakefile b/unit/GNUmakefile
index ab12b9ac..b87f1ac5 100644
--- a/unit/GNUmakefile
+++ b/unit/GNUmakefile
@@ -4,8 +4,6 @@ DEFINES             = -DNDEBUG -DSWIG_SHARED_OBJ -DPHREEQC_CPP -DPHREEQC_CLASS -
 CFLAGS              = -Wall -O3
 CPPFLAGS            = $(DEFINES) -I$(CPPUNIT)/include -I../include -I../src -I../src/phreeqcpp -I../src/phreeqcpp/phreeqc
 TARGET_ARCH         =
-FC                  = f95
-FFLAGS              = -fno-second-underscore
 CXX                 = g++
 CXXFLAGS            = -Wall -DNDEBUG
 RANLIB              = ranlib
@@ -36,6 +34,8 @@ VPATH=.:../src:../src/phreeqcpp:../src/phreeqcpp/phreeqc
 TOBJS =	\
 		TestCVar.o \
 		TestInterface.o \
+		TestIPhreeqc.o \
+		TestIPhreeqcLib.o \
 		TestSelectedOutput.o \
 		TestVar.o \
 		unit.o
@@ -43,6 +43,8 @@ TOBJS =	\
 
 SOBJS =	\
 		IPhreeqc.o \
+		IPhreeqc2.o \
+		IPhreeqcLib.o \
 		SelectedOutput.o \
 		Var.o \
 		fwrap.o \
@@ -100,9 +102,11 @@ POBJS =	\
 		model.o \
 		nvector.o \
 		nvector_serial.o \
+		output.o \
 		p2clib.o \
 		parse.o \
 		phqalloc.o \
+		phreeqc_files.o \
 		pitzer.o \
 		pitzer_structures.o \
 		prep.o \
@@ -303,7 +307,7 @@ utilities.o: ../src/phreeqcpp/phreeqc/utilities.c \
 
 # SOBJS
 IPhreeqc.o: ../src/IPhreeqc.cpp ../include/IPhreeqc.h \
- ../include/IPhreeqcCallbacks.h ../include/Var.h ../src/IPhreeqc.hpp \
+ ../include/IPhreeqcCallbacks.h ../include/Var.h ../include/IPhreeqc.hpp \
  ../src/phreeqcpp/Phreeqc.h ../src/phreeqcpp/phreeqc/phrqtype.h \
  ../src/phreeqcpp/phreeqc/sundialstypes.h \
  ../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/nvector.h \