From dbf089e1dbef75f70a8382eb6757cc8cb88d47bc Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Sat, 4 Feb 2012 00:44:10 +0000 Subject: [PATCH] [cantera]: edits to make shared libraries build --- Cantera/ext/f2c_blas/Makefile.am | 5 +++++ Cantera/ext/f2c_lapack/Makefile.am | 5 +++++ Cantera/ext/f2c_math/Makefile.am | 5 +++++ Cantera/ext/tpx/Makefile.am | 5 +++++ test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp | 4 ++-- test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp | 4 ++-- test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp | 4 ++-- test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp | 4 ++-- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Cantera/ext/f2c_blas/Makefile.am b/Cantera/ext/f2c_blas/Makefile.am index 27b3913a1..da9bd2997 100644 --- a/Cantera/ext/f2c_blas/Makefile.am +++ b/Cantera/ext/f2c_blas/Makefile.am @@ -58,3 +58,8 @@ __top_builddir__build_lib_libctblas_la_LDFLAGS = $(all_libraries) -release __top_builddir__build_lib_libctblas_la_SOURCES = $(cc_sources) $(h_sources) CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp *.h $(top_builddir)/build/include/ diff --git a/Cantera/ext/f2c_lapack/Makefile.am b/Cantera/ext/f2c_lapack/Makefile.am index aea174a0f..f16530f90 100644 --- a/Cantera/ext/f2c_lapack/Makefile.am +++ b/Cantera/ext/f2c_lapack/Makefile.am @@ -25,3 +25,8 @@ __top_builddir__build_lib_libctlapack_la_LDFLAGS = $(all_libraries) -releas __top_builddir__build_lib_libctlapack_la_SOURCES = $(cc_sources) $(h_sources) CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp *.h $(top_builddir)/build/include/ diff --git a/Cantera/ext/f2c_math/Makefile.am b/Cantera/ext/f2c_math/Makefile.am index 9cc6cc6b3..b07fca59e 100644 --- a/Cantera/ext/f2c_math/Makefile.am +++ b/Cantera/ext/f2c_math/Makefile.am @@ -39,3 +39,8 @@ __top_builddir__build_lib_libctmath_la_LDFLAGS = $(all_libraries) -release __top_builddir__build_lib_libctmath_la_SOURCES = $(cc_sources) $(h_sources) CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp *.h $(top_builddir)/build/include/ diff --git a/Cantera/ext/tpx/Makefile.am b/Cantera/ext/tpx/Makefile.am index 1988875ab..46e3f0de1 100644 --- a/Cantera/ext/tpx/Makefile.am +++ b/Cantera/ext/tpx/Makefile.am @@ -19,3 +19,8 @@ __top_builddir__build_lib_libtpx_la_LDFLAGS = $(all_libraries) -release $(G __top_builddir__build_lib_libtpx_la_SOURCES = $(cc_sources) $(h_sources) CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp *.h $(top_builddir)/build/include/ diff --git a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp index 52fe873fb..f18fcf2b1 100644 --- a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp @@ -15,8 +15,8 @@ #include "DebyeHuckel.h" #else #include "Cantera.h" -#include "kernel/logger.h" -#include "kernel/DebyeHuckel.h" +#include "logger.h" +#include "DebyeHuckel.h" #endif #include diff --git a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp index 52fe873fb..f18fcf2b1 100644 --- a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp @@ -15,8 +15,8 @@ #include "DebyeHuckel.h" #else #include "Cantera.h" -#include "kernel/logger.h" -#include "kernel/DebyeHuckel.h" +#include "logger.h" +#include "DebyeHuckel.h" #endif #include diff --git a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp index 52fe873fb..f18fcf2b1 100644 --- a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp @@ -15,8 +15,8 @@ #include "DebyeHuckel.h" #else #include "Cantera.h" -#include "kernel/logger.h" -#include "kernel/DebyeHuckel.h" +#include "logger.h" +#include "DebyeHuckel.h" #endif #include diff --git a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp index 52fe873fb..f18fcf2b1 100644 --- a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp @@ -15,8 +15,8 @@ #include "DebyeHuckel.h" #else #include "Cantera.h" -#include "kernel/logger.h" -#include "kernel/DebyeHuckel.h" +#include "logger.h" +#include "DebyeHuckel.h" #endif #include