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

getting rid of include driectory to avoid duplicate header files

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-01-11 01:18:11 +00:00
parent e09614dfc2
commit 918541e7a0
10 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/Makefile
View File

@ -3,9 +3,9 @@ TARGET = IPhreeqc.chm
DOXYGEN = doxygen DOXYGEN = doxygen
HEADERS = \ HEADERS = \
../include/IPhreeqc.h \ ../src/IPhreeqc.h \
../include/Var.h \ ../src/Var.h \
../include/IPhreeqc.hpp ../src/IPhreeqc.hpp
EXAMPLES = \ EXAMPLES = \
examples/AccumulateLine.c \ examples/AccumulateLine.c \
@ -19,10 +19,10 @@ EXAMPLES = \
examples/F90CreateIPhreeqc.f90 \ examples/F90CreateIPhreeqc.f90 \
examples/F90DestroyIPhreeqc.f90 \ examples/F90DestroyIPhreeqc.f90 \
examples/F90GetComponent.f90 \ examples/F90GetComponent.f90 \
examples/F90GetDumpStringLine.f90 \
examples/F90GetLogStringLine.f90 \ examples/F90GetLogStringLine.f90 \
examples/F90GetOutputStringLine.f90 \ examples/F90GetOutputStringLine.f90 \
examples/F90GetSelectedOutputValue.f90 \ examples/F90GetSelectedOutputValue.f90
examples/F90GetDumpStringLine.f90
all: $(TARGET) all: $(TARGET)

4
doc/examples/Makefile
View File

@ -1,11 +1,11 @@
CC = gcc CC = gcc
CPPFLAGS = -I../../include CPPFLAGS = -I../../src -I../../src/phreeqcpp
CXX = g++ CXX = g++
DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__ DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__
F77 = gfortran F77 = gfortran
FC = gfortran FC = gfortran
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
FFLAGS = -I../../include -g -O2 -Wall FFLAGS = -I../../src -g -O2 -Wall
FCLIBS = -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1 -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1/../../.. -lgfortranbegin -lgfortran -lm FCLIBS = -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1 -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1/../../.. -lgfortranbegin -lgfortran -lm
LIBTOOL = /bin/sh ../../_build/libtool LIBTOOL = /bin/sh ../../_build/libtool
LDFLAGS = LDFLAGS =

0
include/IPhreeqc.f.inc → src/IPhreeqc.f.inc
View File

0
include/IPhreeqc.f90.inc → src/IPhreeqc.f90.inc
View File

0
include/IPhreeqc.h → src/IPhreeqc.h
View File

0
include/IPhreeqc.hpp → src/IPhreeqc.hpp
View File

0
include/IPhreeqcCallbacks.h → src/IPhreeqcCallbacks.h
View File

16
src/Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST = fwrap2.cpp fwrap3.cpp EXTRA_DIST = fwrap2.cpp fwrap3.cpp
AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc
# libtool libraries to build # libtool libraries to build
lib_LTLIBRARIES=libiphreeqc.la lib_LTLIBRARIES=libiphreeqc.la
@ -141,10 +141,12 @@ libiphreeqc_la_SOURCES=\
phreeqcpp/phreeqc/utilities.cpp phreeqcpp/phreeqc/utilities.cpp
include_HEADERS=\ include_HEADERS=\
$(top_srcdir)/include/IPhreeqc.h\ $(top_srcdir)/src/IPhreeqc.h\
$(top_srcdir)/include/IPhreeqc.hpp\ $(top_srcdir)/src/IPhreeqc.hpp\
$(top_srcdir)/include/IPhreeqcCallbacks.h\ $(top_srcdir)/src/IPhreeqcCallbacks.h\
$(top_srcdir)/include/Var.h $(top_srcdir)/src/Var.h\
$(top_srcdir)/src/phreeqcpp/PHRQ_io.h\
$(top_srcdir)/src/phreeqcpp/Keywords.h
if BUILD_FORTRAN if BUILD_FORTRAN
@ -155,8 +157,8 @@ libiphreeqc_la_SOURCES+=\
IPhreeqcF.f IPhreeqcF.f
include_HEADERS+=\ include_HEADERS+=\
$(top_srcdir)/include/IPhreeqc.f90.inc\ $(top_srcdir)/src/IPhreeqc.f90.inc\
$(top_srcdir)/include/IPhreeqc.f.inc $(top_srcdir)/src/IPhreeqc.f.inc
endif endif

0
include/Var.h → src/Var.h
View File

6
tests/Makefile.am
View File

@ -1,8 +1,8 @@
EXTRA_DIST = test_c.vcproj test_cxx.vcproj test_f90.vfproj test_f.vfproj main77.f main.f90 EXTRA_DIST = test_c.vcproj test_cxx.vcproj test_f90.vfproj test_f.vfproj main77.f main.f90
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp
AM_FCFLAGS = -I$(top_srcdir)/include AM_FCFLAGS = -I$(top_srcdir)/src
AM_FFLAGS = -I$(top_srcdir)/include AM_FFLAGS = -I$(top_srcdir)/src
TESTS = test_c test_cxx TESTS = test_c test_cxx
check_PROGRAMS = test_c test_cxx check_PROGRAMS = test_c test_cxx