From 0527e27f64c069b4c69fef9b6037839964ffc5c2 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 15 Apr 2010 06:47:05 +0000 Subject: [PATCH] working on autotools git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4260 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- Makefile.am | 87 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 48922563..043f31ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,85 +1,152 @@ +AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/cxx -DSWIG_SHARED_OBJ -DPHREEQC_CPP -DPHREEQC_CLASS -DUSE_PHRQ_ALLOC + lib_LTLIBRARIES=libiphreeqc.la # library sources -libiphreeqc_la_SOURCES= \ +libiphreeqc_la_SOURCES=\ +CVar.hxx\ +Debug.h\ +ErrorReporter.hxx\ +fwrap.cpp\ +fwrap.h\ fwrap2.cpp\ fwrap3.cpp\ -fwrap.cpp\ IPhreeqc.cpp\ +IPhreeqcF.F\ IPhreeqcLib.cpp\ SelectedOutput.cpp\ +SelectedOutput.hxx\ Var.c\ -IPhreeqcF.F\ +phreeqcpp/char_star.h\ phreeqcpp/cxxKinetics.cxx\ +phreeqcpp/cxxKinetics.h\ phreeqcpp/cxxMix.cxx\ +phreeqcpp/cxxMix.h\ +phreeqcpp/Dictionary.h\ phreeqcpp/dumper.cpp\ +phreeqcpp/dumper.h\ phreeqcpp/Exchange.cxx\ +phreeqcpp/Exchange.h\ phreeqcpp/ExchComp.cxx\ +phreeqcpp/ExchComp.h\ phreeqcpp/GasPhase.cxx\ -phreeqcpp/ISolutionComp.cxx\ +phreeqcpp/GasPhase.h\ phreeqcpp/ISolution.cxx\ +phreeqcpp/ISolution.h\ +phreeqcpp/ISolutionComp.cxx\ +phreeqcpp/ISolutionComp.h\ phreeqcpp/KineticsComp.cxx\ +phreeqcpp/KineticsComp.h\ phreeqcpp/NameDouble.cxx\ +phreeqcpp/NameDouble.h\ phreeqcpp/NumKeyword.cxx\ +phreeqcpp/NumKeyword.h\ phreeqcpp/Parser.cxx\ +phreeqcpp/Parser.h\ phreeqcpp/Phreeqc.cpp\ -phreeqcpp/PPassemblageComp.cxx\ +phreeqcpp/Phreeqc.h\ +phreeqcpp/Phreeqc_class.h\ phreeqcpp/PPassemblage.cxx\ +phreeqcpp/PPassemblage.h\ +phreeqcpp/PPassemblageComp.cxx\ +phreeqcpp/PPassemblageComp.h\ phreeqcpp/Reaction.cxx\ +phreeqcpp/Reaction.h\ phreeqcpp/ReadClass.cxx\ phreeqcpp/runner.cpp\ +phreeqcpp/runner.h\ +phreeqcpp/SAXPhreeqc.h\ +phreeqcpp/SaxPhreeqcHandlers.h\ phreeqcpp/Solution.cxx\ +phreeqcpp/Solution.h\ phreeqcpp/SolutionIsotope.cxx\ +phreeqcpp/SolutionIsotope.h\ phreeqcpp/SolutionIsotopeList.cxx\ +phreeqcpp/SolutionIsotopeList.h\ phreeqcpp/SSassemblage.cxx\ +phreeqcpp/SSassemblage.h\ phreeqcpp/SSassemblageSS.cxx\ +phreeqcpp/SSassemblageSS.h\ phreeqcpp/StorageBin.cxx\ +phreeqcpp/StorageBin.h\ phreeqcpp/StorageBinList.cpp\ -phreeqcpp/SurfaceCharge.cxx\ -phreeqcpp/SurfaceComp.cxx\ +phreeqcpp/StorageBinList.h\ phreeqcpp/Surface.cxx\ +phreeqcpp/Surface.h\ +phreeqcpp/SurfaceCharge.cxx\ +phreeqcpp/SurfaceCharge.h\ +phreeqcpp/SurfaceComp.cxx\ +phreeqcpp/SurfaceComp.h\ phreeqcpp/System.cxx\ +phreeqcpp/System.h\ phreeqcpp/Temperature.cxx\ +phreeqcpp/Temperature.h\ phreeqcpp/Utils.cxx\ +phreeqcpp/Utils.h\ phreeqcpp/cxx/advection.cxx\ phreeqcpp/cxx/basic.cxx\ +phreeqcpp/cxx/basic.h\ phreeqcpp/cxx/basicsubs.cxx\ phreeqcpp/cxx/cl1.cxx\ phreeqcpp/cxx/cvdense.cxx\ +phreeqcpp/cxx/cvdense.h\ phreeqcpp/cxx/cvode.cxx\ +phreeqcpp/cxx/cvode.h\ phreeqcpp/cxx/dense.cxx\ +phreeqcpp/cxx/dense.h\ phreeqcpp/cxx/dw.cxx\ +phreeqcpp/cxx/global.h\ +phreeqcpp/cxx/global_structures.h\ phreeqcpp/cxx/input.cxx\ +phreeqcpp/cxx/input.h\ phreeqcpp/cxx/integrate.cxx\ phreeqcpp/cxx/inverse.cxx\ phreeqcpp/cxx/isotopes.cxx\ phreeqcpp/cxx/kinetics.cxx\ +phreeqcpp/cxx/kinetics.h\ phreeqcpp/cxx/mainsubs.cxx\ phreeqcpp/cxx/model.cxx\ phreeqcpp/cxx/nvector.cxx\ +phreeqcpp/cxx/nvector.h\ phreeqcpp/cxx/nvector_serial.cxx\ +phreeqcpp/cxx/nvector_serial.h\ phreeqcpp/cxx/output.cxx\ +phreeqcpp/cxx/output.h\ +phreeqcpp/cxx/p2c.h\ phreeqcpp/cxx/p2clib.cxx\ phreeqcpp/cxx/parse.cxx\ phreeqcpp/cxx/phqalloc.cxx\ +phreeqcpp/cxx/phqalloc.h\ phreeqcpp/cxx/phreeqc_files.cxx\ +phreeqcpp/cxx/phrqproto.h\ +phreeqcpp/cxx/phrqtype.h\ phreeqcpp/cxx/pitzer.cxx\ +phreeqcpp/cxx/pitzer.h\ phreeqcpp/cxx/pitzer_structures.cxx\ +phreeqcpp/cxx/pitzer_structures.h\ phreeqcpp/cxx/prep.cxx\ phreeqcpp/cxx/print.cxx\ phreeqcpp/cxx/read.cxx\ phreeqcpp/cxx/readtr.cxx\ phreeqcpp/cxx/sit.cxx\ phreeqcpp/cxx/smalldense.cxx\ +phreeqcpp/cxx/smalldense.h\ phreeqcpp/cxx/spread.cxx\ phreeqcpp/cxx/step.cxx\ phreeqcpp/cxx/structures.cxx\ phreeqcpp/cxx/sundialsmath.cxx\ +phreeqcpp/cxx/sundialsmath.h\ +phreeqcpp/cxx/sundialstypes.h\ phreeqcpp/cxx/tally.cxx\ phreeqcpp/cxx/tidy.cxx\ phreeqcpp/cxx/transport.cxx\ phreeqcpp/cxx/utilities.cxx -AM_CPPFLAGS = -I../include -I../src -I../src/phreeqcpp -I../src/phreeqcpp/cxx -DSWIG_SHARED_OBJ -DPHREEQC_CPP -DPHREEQC_CLASS -DUSE_PHRQ_ALLOC - - +include_HEADERS=\ +$(top_srcdir)/include/IPhreeqc.h\ +$(top_srcdir)/include/IPhreeqcCallbacks.h\ +$(top_srcdir)/include/IPhreeqc.f90.inc\ +$(top_srcdir)/include/IPhreeqc.f.inc\ +$(top_srcdir)/include/IPhreeqc.h\ +$(top_srcdir)/include/IPhreeqc.hpp\ +$(top_srcdir)/include/Var.h