diff --git a/Makefile.am b/Makefile.am index c82503591..fd3dc7c19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/doxygen/aminclude.am # Build in these directories: -SUBDIRS = Cantera examples test_problems +SUBDIRS = Cantera ext examples test_problems SUBDIRS += doxygen # Distribute these directories: diff --git a/configure.ac b/configure.ac index 36cfe35f8..f819c2875 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,9 @@ AC_OUTPUT(Makefile examples/Makefile \ examples/cxx/Makefile \ test_problems/Makefile \ doxygen/Makefile \ + ext/Makefile \ + ext/tpx/Makefile \ + ext/math/Makefile \ Cantera/Makefile \ Cantera/src/Makefile Cantera/src/base/Makefile \ Cantera/src/converters/Makefile \ diff --git a/ext/Makefile.am b/ext/Makefile.am index 323231d9c..da562fe76 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = tpx +SUBDIRS = tpx math diff --git a/ext/Makefile.in b/ext/Makefile.in index c9803ddd7..f01d5573b 100755 --- a/ext/Makefile.in +++ b/ext/Makefile.in @@ -240,7 +240,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = tpx +SUBDIRS = tpx math all: all-recursive .SUFFIXES: diff --git a/ext/math/Makefile.am b/ext/math/Makefile.am index b67d774b7..7a221434d 100644 --- a/ext/math/Makefile.am +++ b/ext/math/Makefile.am @@ -1,21 +1,24 @@ -h_sources = -cc_sources = +cc_sources = mach.cpp printstring.c + +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 = 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_include_HEADERS = $(h_sources) -otherincludedir = $(top_builddir)/build/include/cantera/kernel -otherinclude_HEADERS = $(h_sources) - #----------------------- # Cantera Converters C/C++ library #----------------------- -__top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) -__top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctmath_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctmath_la_SOURCES = $(fc_sources) $(cc_sources) CLEANFILES = *.o diff --git a/ext/math/printstring.c b/ext/math/printstring.c index fd6476ed7..f4c8cdde1 100644 --- a/ext/math/printstring.c +++ b/ext/math/printstring.c @@ -1,9 +1,13 @@ #include #include "config.h" + +typedef int ftnlen; + #ifdef __cplusplus extern "C" { #endif -void printstring_(char* s, ftnlen ls) { +void printstring_(char* s, ftnlen ls) +{ printf("%s",s); } #ifdef __cplusplus