research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cantera]: few more modifications to trunk of our tools, to enable regression testing with make check

Browse source
This commit is contained in:
Nicholas Malaya 2012-01-05 18:54:50 +00:00
parent 4b4fb7f3e1
commit 2e697b3223
6 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,7 +1,7 @@
include $(top_srcdir)/doxygen/aminclude.am include $(top_srcdir)/doxygen/aminclude.am
# Build in these directories: # Build in these directories:
SUBDIRS = Cantera examples test_problems SUBDIRS = Cantera ext examples test_problems
SUBDIRS += doxygen SUBDIRS += doxygen
# Distribute these directories: # Distribute these directories:

3
configure.ac
View file

@ -58,6 +58,9 @@ AC_OUTPUT(Makefile examples/Makefile \
examples/cxx/Makefile \ examples/cxx/Makefile \
test_problems/Makefile \ test_problems/Makefile \
doxygen/Makefile \ doxygen/Makefile \
ext/Makefile \
ext/tpx/Makefile \
ext/math/Makefile \
Cantera/Makefile \ Cantera/Makefile \
Cantera/src/Makefile Cantera/src/base/Makefile \ Cantera/src/Makefile Cantera/src/base/Makefile \
Cantera/src/converters/Makefile \ Cantera/src/converters/Makefile \

2
ext/Makefile.am
View file

@ -1,2 +1,2 @@
SUBDIRS = tpx SUBDIRS = tpx math

2
ext/Makefile.in
View file

@ -240,7 +240,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = tpx SUBDIRS = tpx math
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

19
ext/math/Makefile.am
View file

@ -1,21 +1,24 @@
h_sources = cc_sources = mach.cpp printstring.c
cc_sources =
fc_sources = ddaspk.f dgbfa.f dgbsl.f \
dgefa.f dgesl.f dp1vlu.f dpcoef.f \
dpolft.f fdump.f j4save.f pcoef.f \
polfit.f pvalue.f xercnt.f xerhlt.f \
xermsg.f xerprn.f xersve.f xgetua.f
INCLUDES = INCLUDES =
AM_CXXFLAGS = $(INCLUDES) AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la lib_LTLIBRARIES = $(top_builddir)/build/lib/libctmath.la
library_includedir = $(top_builddir)/build/include library_includedir = $(top_builddir)/build/include
library_include_HEADERS = $(h_sources) library_include_HEADERS = $(h_sources)
otherincludedir = $(top_builddir)/build/include/cantera/kernel
otherinclude_HEADERS = $(h_sources)
#----------------------- #-----------------------
# Cantera Converters C/C++ library # Cantera Converters C/C++ library
#----------------------- #-----------------------
__top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctmath_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
__top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) __top_builddir__build_lib_libctmath_la_SOURCES = $(fc_sources) $(cc_sources)
CLEANFILES = *.o CLEANFILES = *.o

6
ext/math/printstring.c
View file

@ -1,9 +1,13 @@
#include <stdio.h> #include <stdio.h>
#include "config.h" #include "config.h"
typedef int ftnlen;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void printstring_(char* s, ftnlen ls) { void printstring_(char* s, ftnlen ls)
{
printf("%s",s); printf("%s",s);
} }
#ifdef __cplusplus #ifdef __cplusplus