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

working on autotools

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4307 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-04-27 03:20:38 +00:00
parent 2989d8101b
commit baff9863e2
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
AC_INIT([IPhreeqc], [2.17], [charlton@usgs.gov])
AC_INIT([IPhreeqc], [2.17.0], [charlton@usgs.gov])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
@ -27,24 +27,20 @@ AC_ARG_ENABLE([fortran],
[IPQ_FORTRAN=yes])
if test "X$IPQ_FORTRAN" = "Xyes"; then
echo "yes"
AC_MSG_RESULT(yes)
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
AC_FC_MAIN
AC_SUBST(F77, $FC)
AC_SUBST(FFLAGS, $FCFLAGS)
#{{
## AC_SUBST(COMPILE, $CXXCOMPILE)
## AC_SUBST(LTCOMPILE, $LTCXXCOMPILE)
#}}
else
echo "no"
AC_MSG_RESULT(no)
fi
AM_CONDITIONAL([BUILD_FORTRAN], [test "X$IPQ_FORTRAN" = "Xyes"])
# Disable shared library building by default (use --enable-shared to enable)
AC_DISABLE_SHARED
##AC_DISABLE_SHARED
AC_PROG_LIBTOOL
# Checks for libraries.

6
src/Makefile.am
View File

@ -1,15 +1,9 @@
#AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc
AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc
SUBDIRS=phreeqcpp
lib_LTLIBRARIES=libiphreeqc.la
##{{
##libiphreeqc_la_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc
##libiphreeqc_la_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/phreeqc
##}}
# library sources
libiphreeqc_la_SOURCES=\
CVar.hxx\

12
tests/Makefile.am
View File

@ -13,12 +13,12 @@ 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
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_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
test_f90_SOURCES = test_f90.f90 main_fortran.cxx
test_f90_LDADD = $(top_builddir)/src/libiphreeqc.la $(FCLIBS)
endif